From d70be4f3c1b638e4e24001ecca8bb628786dd06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Wed, 23 Jan 2019 17:33:43 -0800 Subject: [PATCH] Cleanup. --- src/bgfx_shader.sh | 8 ++++---- src/renderer_gl.h | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bgfx_shader.sh b/src/bgfx_shader.sh index a796c5e5a..72b1a5097 100644 --- a/src/bgfx_shader.sh +++ b/src/bgfx_shader.sh @@ -61,12 +61,12 @@ # define dFdyFine(_y) ddy_fine(-_y) # endif // BGFX_SHADER_LANGUAGE_HLSL > 4 -# if BGFX_SHADER_LANGUAGE_HLSL +# if BGFX_SHADER_LANGUAGE_HLSL || BGFX_SHADER_LANGUAGE_SPIRV || BGFX_SHADER_LANGUAGE_METAL float intBitsToFloat(int _x) { return asfloat(_x); } vec2 intBitsToFloat(uint2 _x) { return asfloat(_x); } vec3 intBitsToFloat(uint3 _x) { return asfloat(_x); } vec4 intBitsToFloat(uint4 _x) { return asfloat(_x); } -# endif // BGFX_SHADER_LANGUAGE_HLSL +# endif // BGFX_SHADER_LANGUAGE_HLSL || BGFX_SHADER_LANGUAGE_SPIRV || BGFX_SHADER_LANGUAGE_METAL float uintBitsToFloat(uint _x) { return asfloat(_x); } vec2 uintBitsToFloat(uint2 _x) { return asfloat(_x); } @@ -88,7 +88,7 @@ uint2 bitfieldReverse(uint2 _x) { return reversebits(_x); } uint3 bitfieldReverse(uint3 _x) { return reversebits(_x); } uint4 bitfieldReverse(uint4 _x) { return reversebits(_x); } -# if !BGFX_SHADER_LANGUAGE_SPIRV && !BGFX_SHADER_LANGUAGE_METAL +# if !BGFX_SHADER_LANGUAGE_SPIRV uint packHalf2x16(vec2 _x) { return (f32tof16(_x.y)<<16) | f32tof16(_x.x); @@ -98,7 +98,7 @@ vec2 unpackHalf2x16(uint _x) { return vec2(f16tof32(_x & 0xffff), f16tof32(_x >> 16) ); } -# endif // !BGFX_SHADER_LANGUAGE_SPIRV && !BGFX_SHADER_LANGUAGE_METAL +# endif // !BGFX_SHADER_LANGUAGE_SPIRV struct BgfxSampler2D { diff --git a/src/renderer_gl.h b/src/renderer_gl.h index ca51c6e6e..1afb1a558 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -916,6 +916,10 @@ typedef uint64_t GLuint64; # define GL_TEXTURE 0x1702 #endif // GL_TEXTURE +#ifndef GL_BUFFER +# define GL_BUFFER 0x82E0 +#endif // GL_BUFFER + // _KHR or _ARB... #define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 #define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243