Browse Source

Remove obsolete glLoadGen-related workarounds.

pull/38/head
Vladimír Vondruš 13 years ago
parent
commit
100527cd3d
  1. 3
      src/AbstractShaderProgram.cpp
  2. 12
      src/TextureFormat.h

3
src/AbstractShaderProgram.cpp

@ -117,9 +117,8 @@ Int AbstractShaderProgram::maxComputeWorkGroupInvocations() {
GLint& value = Context::current()->state().shaderProgram->maxComputeWorkGroupInvocations; GLint& value = Context::current()->state().shaderProgram->maxComputeWorkGroupInvocations;
/** @todo Fix when glLoadGen has `GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS` */
if(value == 0) if(value == 0)
glGetIntegerv(/*GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS*/0x90EB, &value); glGetIntegerv(GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS, &value);
return value; return value;
} }

12
src/TextureFormat.h

@ -718,33 +718,29 @@ enum class TextureFormat: GLenum {
* BPTC compressed RGB, unsigned float. * BPTC compressed RGB, unsigned float.
* @requires_gl42 %Extension @extension{ARB,texture_compression_bptc} * @requires_gl42 %Extension @extension{ARB,texture_compression_bptc}
* @requires_gl BPTC texture compression is not available in OpenGL ES. * @requires_gl BPTC texture compression is not available in OpenGL ES.
* @todo Remove workaround when glLoadGen has `GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT`
*/ */
CompressedRGBBptcUnsignedFloat = 0x8E8F,//GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT, CompressedRGBBptcUnsignedFloat = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT,
/** /**
* BPTC compressed RGB, signed float. * BPTC compressed RGB, signed float.
* @requires_gl42 %Extension @extension{ARB,texture_compression_bptc} * @requires_gl42 %Extension @extension{ARB,texture_compression_bptc}
* @requires_gl BPTC texture compression is not available in OpenGL ES. * @requires_gl BPTC texture compression is not available in OpenGL ES.
* @todo Remove workaround when glLoadGen has `GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT`
*/ */
CompressedRGBBptcSignedFloat = 0x8E8E,//GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT, CompressedRGBBptcSignedFloat = GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT,
/** /**
* BPTC compressed RGBA, normalized unsigned. * BPTC compressed RGBA, normalized unsigned.
* @requires_gl42 %Extension @extension{ARB,texture_compression_bptc} * @requires_gl42 %Extension @extension{ARB,texture_compression_bptc}
* @requires_gl BPTC texture compression is not available in OpenGL ES. * @requires_gl BPTC texture compression is not available in OpenGL ES.
* @todo Remove workaround when glLoadGen has `GL_COMPRESSED_RGBA_BPTC_UNORM`
*/ */
CompressedRGBABptcUnorm = 0x8E8C,//GL_COMPRESSED_RGBA_BPTC_UNORM, CompressedRGBABptcUnorm = GL_COMPRESSED_RGBA_BPTC_UNORM,
/** /**
* BPTC compressed sRGBA, normalized unsigned. * BPTC compressed sRGBA, normalized unsigned.
* @requires_gl42 %Extension @extension{ARB,texture_compression_bptc} * @requires_gl42 %Extension @extension{ARB,texture_compression_bptc}
* @requires_gl BPTC texture compression is not available in OpenGL ES. * @requires_gl BPTC texture compression is not available in OpenGL ES.
* @todo Remove workaround when glLoadGen has `GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM`
*/ */
CompressedSRGBAlphaBptcUnorm = 0x8E8D,//GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM, CompressedSRGBAlphaBptcUnorm = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM,
#endif #endif
/** /**

Loading…
Cancel
Save