Browse Source

Fix Mac build

Not sure why I'm getting a linker error with these not marked as
static. Should investigate.
master
cancel 6 years ago
parent
commit
4dc405c85c
  1. 17
      gbuffer.h

17
gbuffer.h

@ -1,14 +1,16 @@
#pragma once #pragma once
#include "base.h" #include "base.h"
inline Glyph gbuffer_peek(Gbuffer gbuf, Usz height, Usz width, Usz y, Usz x) { static inline Glyph gbuffer_peek(Gbuffer gbuf, Usz height, Usz width, Usz y,
Usz x) {
assert(y < height && x < width); assert(y < height && x < width);
(void)height; (void)height;
return gbuf[y + width + x]; return gbuf[y + width + x];
} }
inline Glyph gbuffer_peek_relative(Gbuffer gbuf, Usz height, Usz width, Usz y, static inline Glyph gbuffer_peek_relative(Gbuffer gbuf, Usz height, Usz width,
Usz x, Isz delta_y, Isz delta_x) { Usz y, Usz x, Isz delta_y,
Isz delta_x) {
Isz y0 = (Isz)y + delta_y; Isz y0 = (Isz)y + delta_y;
Isz x0 = (Isz)x + delta_x; Isz x0 = (Isz)x + delta_x;
if (y0 < 0 || x0 < 0 || (Usz)y0 >= height || (Usz)x0 >= width) if (y0 < 0 || x0 < 0 || (Usz)y0 >= height || (Usz)x0 >= width)
@ -16,15 +18,16 @@ inline Glyph gbuffer_peek_relative(Gbuffer gbuf, Usz height, Usz width, Usz y,
return gbuf[(Usz)y0 * width + (Usz)x0]; return gbuf[(Usz)y0 * width + (Usz)x0];
} }
inline void gbuffer_poke(Gbuffer gbuf, Usz height, Usz width, Usz y, Usz x, static inline void gbuffer_poke(Gbuffer gbuf, Usz height, Usz width, Usz y,
Glyph g) { Usz x, Glyph g) {
assert(y < height && x < width); assert(y < height && x < width);
(void)height; (void)height;
gbuf[y * width + x] = g; gbuf[y * width + x] = g;
} }
inline void gbuffer_poke_relative(Gbuffer gbuf, Usz height, Usz width, Usz y, static inline void gbuffer_poke_relative(Gbuffer gbuf, Usz height, Usz width,
Usz x, Isz delta_y, Isz delta_x, Glyph g) { Usz y, Usz x, Isz delta_y, Isz delta_x,
Glyph g) {
Isz y0 = (Isz)y + delta_y; Isz y0 = (Isz)y + delta_y;
Isz x0 = (Isz)x + delta_x; Isz x0 = (Isz)x + delta_x;
if (y0 < 0 || x0 < 0 || (Usz)y0 >= height || (Usz)x0 >= width) if (y0 < 0 || x0 < 0 || (Usz)y0 >= height || (Usz)x0 >= width)

Loading…
Cancel
Save