1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-29 16:29:08 +00:00

Improves macro safety.

This commit is contained in:
Thomas Harte 2020-09-15 22:26:33 -04:00
parent 69d21daaa3
commit bc8787ded6

View File

@ -138,13 +138,13 @@ constexpr MTLResourceOptions SharedResourceOptionsTexture = MTLResourceCPUCacheM
#define uniforms() reinterpret_cast<Uniforms *>(_uniformsBuffer.contents) #define uniforms() reinterpret_cast<Uniforms *>(_uniformsBuffer.contents)
#define RangePerform(start, end, size, func) \ #define RangePerform(start, end, size, func) \
if(start != end) { \ if((start) != (end)) { \
if(start < end) { \ if((start) < (end)) { \
func(start, end-start); \ func((start), (end) - (start)); \
} else { \ } else { \
func(start, size-start); \ func((start), (size) - (start)); \
if(end) { \ if(end) { \
func(0, end); \ func(0, (end)); \
} \ } \
} \ } \
} }
@ -854,7 +854,7 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
#endif #endif
#define OutputStrips(start, size) [encoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4 instanceCount:size baseInstance:start] #define OutputStrips(start, size) [encoder drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4 instanceCount:size baseInstance:start]
RangePerform(start, end, (_pipeline != Pipeline::DirectToDisplay ? NumBufferedLines : NumBufferedScans), OutputStrips); RangePerform(start, end, _pipeline != Pipeline::DirectToDisplay ? NumBufferedLines : NumBufferedScans, OutputStrips);
#undef OutputStrips #undef OutputStrips
// Complete encoding. // Complete encoding.