diff --git a/include/GL/glew.h b/include/GL/glew.h index 789b1e4..33e00c9 100644 --- a/include/GL/glew.h +++ b/include/GL/glew.h @@ -10683,44 +10683,6 @@ typedef void (GLAPIENTRY * PFNGLSHADINGRATEEXTPROC) (GLenum rate); #ifndef GL_EXT_fragment_shading_rate_attachment #define GL_EXT_fragment_shading_rate_attachment 1 -#define GL_FRAGMENT_SHADING_RATE_NON_TRIVIAL_COMBINERS_SUPPORTED_EXT 0x8F6F -#define GL_SHADING_RATE_1X1_PIXELS_EXT 0x96A6 -#define GL_SHADING_RATE_1X2_PIXELS_EXT 0x96A7 -#define GL_SHADING_RATE_2X1_PIXELS_EXT 0x96A8 -#define GL_SHADING_RATE_2X2_PIXELS_EXT 0x96A9 -#define GL_SHADING_RATE_1X4_PIXELS_EXT 0x96AA -#define GL_SHADING_RATE_4X1_PIXELS_EXT 0x96AB -#define GL_SHADING_RATE_4X2_PIXELS_EXT 0x96AC -#define GL_SHADING_RATE_2X4_PIXELS_EXT 0x96AD -#define GL_SHADING_RATE_4X4_PIXELS_EXT 0x96AE -#define GL_SHADING_RATE_EXT 0x96D0 -#define GL_SHADING_RATE_ATTACHMENT_EXT 0x96D1 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_EXT 0x96D2 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_REPLACE_EXT 0x96D3 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_MIN_EXT 0x96D4 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_MAX_EXT 0x96D5 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_MUL_EXT 0x96D6 -#define GL_MIN_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_WIDTH_EXT 0x96D7 -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_WIDTH_EXT 0x96D8 -#define GL_MIN_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_HEIGHT_EXT 0x96D9 -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_HEIGHT_EXT 0x96DA -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_ASPECT_RATIO_EXT 0x96DB -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_LAYERS_EXT 0x96DC -#define GL_FRAGMENT_SHADING_RATE_WITH_SHADER_DEPTH_STENCIL_WRITES_SUPPORTED_EXT 0x96DD -#define GL_FRAGMENT_SHADING_RATE_WITH_SAMPLE_MASK_SUPPORTED_EXT 0x96DE -#define GL_FRAGMENT_SHADING_RATE_ATTACHMENT_WITH_DEFAULT_FRAMEBUFFER_SUPPORTED_EXT 0x96DF -#define GL_FRAGMENT_SHADING_RATE_PRIMITIVE_RATE_WITH_MULTI_VIEWPORT_SUPPORTED_EXT 0x9780 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSHADINGRATEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint baseLayer, GLsizei numLayers, GLsizei texelWidth, GLsizei texelHeight); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTSHADINGRATESEXTPROC) (GLsizei samples, GLsizei maxCount, GLsizei* count, GLenum *shadingRates); -typedef void (GLAPIENTRY * PFNGLSHADINGRATECOMBINEROPSEXTPROC) (GLenum combinerOp0, GLenum combinerOp1); -typedef void (GLAPIENTRY * PFNGLSHADINGRATEEXTPROC) (GLenum rate); - -#define glFramebufferShadingRateEXT GLEW_GET_FUN(__glewFramebufferShadingRateEXT) -#define glGetFragmentShadingRatesEXT GLEW_GET_FUN(__glewGetFragmentShadingRatesEXT) -#define glShadingRateCombinerOpsEXT GLEW_GET_FUN(__glewShadingRateCombinerOpsEXT) -#define glShadingRateEXT GLEW_GET_FUN(__glewShadingRateEXT) - #define GLEW_EXT_fragment_shading_rate_attachment GLEW_GET_VAR(__GLEW_EXT_fragment_shading_rate_attachment) #endif /* GL_EXT_fragment_shading_rate_attachment */ @@ -10730,44 +10692,6 @@ typedef void (GLAPIENTRY * PFNGLSHADINGRATEEXTPROC) (GLenum rate); #ifndef GL_EXT_fragment_shading_rate_primitive #define GL_EXT_fragment_shading_rate_primitive 1 -#define GL_FRAGMENT_SHADING_RATE_NON_TRIVIAL_COMBINERS_SUPPORTED_EXT 0x8F6F -#define GL_SHADING_RATE_1X1_PIXELS_EXT 0x96A6 -#define GL_SHADING_RATE_1X2_PIXELS_EXT 0x96A7 -#define GL_SHADING_RATE_2X1_PIXELS_EXT 0x96A8 -#define GL_SHADING_RATE_2X2_PIXELS_EXT 0x96A9 -#define GL_SHADING_RATE_1X4_PIXELS_EXT 0x96AA -#define GL_SHADING_RATE_4X1_PIXELS_EXT 0x96AB -#define GL_SHADING_RATE_4X2_PIXELS_EXT 0x96AC -#define GL_SHADING_RATE_2X4_PIXELS_EXT 0x96AD -#define GL_SHADING_RATE_4X4_PIXELS_EXT 0x96AE -#define GL_SHADING_RATE_EXT 0x96D0 -#define GL_SHADING_RATE_ATTACHMENT_EXT 0x96D1 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_EXT 0x96D2 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_REPLACE_EXT 0x96D3 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_MIN_EXT 0x96D4 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_MAX_EXT 0x96D5 -#define GL_FRAGMENT_SHADING_RATE_COMBINER_OP_MUL_EXT 0x96D6 -#define GL_MIN_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_WIDTH_EXT 0x96D7 -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_WIDTH_EXT 0x96D8 -#define GL_MIN_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_HEIGHT_EXT 0x96D9 -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_HEIGHT_EXT 0x96DA -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_TEXEL_ASPECT_RATIO_EXT 0x96DB -#define GL_MAX_FRAGMENT_SHADING_RATE_ATTACHMENT_LAYERS_EXT 0x96DC -#define GL_FRAGMENT_SHADING_RATE_WITH_SHADER_DEPTH_STENCIL_WRITES_SUPPORTED_EXT 0x96DD -#define GL_FRAGMENT_SHADING_RATE_WITH_SAMPLE_MASK_SUPPORTED_EXT 0x96DE -#define GL_FRAGMENT_SHADING_RATE_ATTACHMENT_WITH_DEFAULT_FRAMEBUFFER_SUPPORTED_EXT 0x96DF -#define GL_FRAGMENT_SHADING_RATE_PRIMITIVE_RATE_WITH_MULTI_VIEWPORT_SUPPORTED_EXT 0x9780 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSHADINGRATEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint baseLayer, GLsizei numLayers, GLsizei texelWidth, GLsizei texelHeight); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTSHADINGRATESEXTPROC) (GLsizei samples, GLsizei maxCount, GLsizei* count, GLenum *shadingRates); -typedef void (GLAPIENTRY * PFNGLSHADINGRATECOMBINEROPSEXTPROC) (GLenum combinerOp0, GLenum combinerOp1); -typedef void (GLAPIENTRY * PFNGLSHADINGRATEEXTPROC) (GLenum rate); - -#define glFramebufferShadingRateEXT GLEW_GET_FUN(__glewFramebufferShadingRateEXT) -#define glGetFragmentShadingRatesEXT GLEW_GET_FUN(__glewGetFragmentShadingRatesEXT) -#define glShadingRateCombinerOpsEXT GLEW_GET_FUN(__glewShadingRateCombinerOpsEXT) -#define glShadingRateEXT GLEW_GET_FUN(__glewShadingRateEXT) - #define GLEW_EXT_fragment_shading_rate_primitive GLEW_GET_VAR(__GLEW_EXT_fragment_shading_rate_primitive) #endif /* GL_EXT_fragment_shading_rate_primitive */ @@ -24639,16 +24563,6 @@ GLEW_FUN_EXPORT PFNGLGETFRAGMENTSHADINGRATESEXTPROC __glewGetFragmentShadingRate GLEW_FUN_EXPORT PFNGLSHADINGRATECOMBINEROPSEXTPROC __glewShadingRateCombinerOpsEXT; GLEW_FUN_EXPORT PFNGLSHADINGRATEEXTPROC __glewShadingRateEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSHADINGRATEEXTPROC __glewFramebufferShadingRateEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTSHADINGRATESEXTPROC __glewGetFragmentShadingRatesEXT; -GLEW_FUN_EXPORT PFNGLSHADINGRATECOMBINEROPSEXTPROC __glewShadingRateCombinerOpsEXT; -GLEW_FUN_EXPORT PFNGLSHADINGRATEEXTPROC __glewShadingRateEXT; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSHADINGRATEEXTPROC __glewFramebufferShadingRateEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTSHADINGRATESEXTPROC __glewGetFragmentShadingRatesEXT; -GLEW_FUN_EXPORT PFNGLSHADINGRATECOMBINEROPSEXTPROC __glewShadingRateCombinerOpsEXT; -GLEW_FUN_EXPORT PFNGLSHADINGRATEEXTPROC __glewShadingRateEXT; - GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT; GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERLAYEREXTPROC __glewBlitFramebufferLayerEXT; diff --git a/src/glew.c b/src/glew.c index 0bc36c9..6a6b622 100644 --- a/src/glew.c +++ b/src/glew.c @@ -2066,16 +2066,6 @@ PFNGLGETFRAGMENTSHADINGRATESEXTPROC __glewGetFragmentShadingRatesEXT = NULL; PFNGLSHADINGRATECOMBINEROPSEXTPROC __glewShadingRateCombinerOpsEXT = NULL; PFNGLSHADINGRATEEXTPROC __glewShadingRateEXT = NULL; -PFNGLFRAMEBUFFERSHADINGRATEEXTPROC __glewFramebufferShadingRateEXT = NULL; -PFNGLGETFRAGMENTSHADINGRATESEXTPROC __glewGetFragmentShadingRatesEXT = NULL; -PFNGLSHADINGRATECOMBINEROPSEXTPROC __glewShadingRateCombinerOpsEXT = NULL; -PFNGLSHADINGRATEEXTPROC __glewShadingRateEXT = NULL; - -PFNGLFRAMEBUFFERSHADINGRATEEXTPROC __glewFramebufferShadingRateEXT = NULL; -PFNGLGETFRAGMENTSHADINGRATESEXTPROC __glewGetFragmentShadingRatesEXT = NULL; -PFNGLSHADINGRATECOMBINEROPSEXTPROC __glewShadingRateCombinerOpsEXT = NULL; -PFNGLSHADINGRATEEXTPROC __glewShadingRateEXT = NULL; - PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT = NULL; PFNGLBLITFRAMEBUFFERLAYEREXTPROC __glewBlitFramebufferLayerEXT = NULL; @@ -10464,8 +10454,6 @@ static GLboolean _glewInit_GL_EXT_external_buffer (void); static GLboolean _glewInit_GL_EXT_fog_coord (void); static GLboolean _glewInit_GL_EXT_fragment_lighting (void); static GLboolean _glewInit_GL_EXT_fragment_shading_rate (void); -static GLboolean _glewInit_GL_EXT_fragment_shading_rate_attachment (void); -static GLboolean _glewInit_GL_EXT_fragment_shading_rate_primitive (void); static GLboolean _glewInit_GL_EXT_framebuffer_blit (void); static GLboolean _glewInit_GL_EXT_framebuffer_blit_layers (void); static GLboolean _glewInit_GL_EXT_framebuffer_multisample (void); @@ -14383,38 +14371,6 @@ static GLboolean _glewInit_GL_EXT_fragment_shading_rate (void) #endif /* GL_EXT_fragment_shading_rate */ -#ifdef GL_EXT_fragment_shading_rate_attachment - -static GLboolean _glewInit_GL_EXT_fragment_shading_rate_attachment (void) -{ - GLboolean r = GL_FALSE; - - r = ((glFramebufferShadingRateEXT = (PFNGLFRAMEBUFFERSHADINGRATEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferShadingRateEXT")) == NULL) || r; - r = ((glGetFragmentShadingRatesEXT = (PFNGLGETFRAGMENTSHADINGRATESEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentShadingRatesEXT")) == NULL) || r; - r = ((glShadingRateCombinerOpsEXT = (PFNGLSHADINGRATECOMBINEROPSEXTPROC)glewGetProcAddress((const GLubyte*)"glShadingRateCombinerOpsEXT")) == NULL) || r; - r = ((glShadingRateEXT = (PFNGLSHADINGRATEEXTPROC)glewGetProcAddress((const GLubyte*)"glShadingRateEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_fragment_shading_rate_attachment */ - -#ifdef GL_EXT_fragment_shading_rate_primitive - -static GLboolean _glewInit_GL_EXT_fragment_shading_rate_primitive (void) -{ - GLboolean r = GL_FALSE; - - r = ((glFramebufferShadingRateEXT = (PFNGLFRAMEBUFFERSHADINGRATEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferShadingRateEXT")) == NULL) || r; - r = ((glGetFragmentShadingRatesEXT = (PFNGLGETFRAGMENTSHADINGRATESEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentShadingRatesEXT")) == NULL) || r; - r = ((glShadingRateCombinerOpsEXT = (PFNGLSHADINGRATECOMBINEROPSEXTPROC)glewGetProcAddress((const GLubyte*)"glShadingRateCombinerOpsEXT")) == NULL) || r; - r = ((glShadingRateEXT = (PFNGLSHADINGRATEEXTPROC)glewGetProcAddress((const GLubyte*)"glShadingRateEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_fragment_shading_rate_primitive */ - #ifdef GL_EXT_framebuffer_blit static GLboolean _glewInit_GL_EXT_framebuffer_blit (void) @@ -19121,12 +19077,6 @@ GLenum GLEWAPIENTRY glewContextInit (void) #ifdef GL_EXT_fragment_shading_rate if (glewExperimental || GLEW_EXT_fragment_shading_rate) GLEW_EXT_fragment_shading_rate = !_glewInit_GL_EXT_fragment_shading_rate(); #endif /* GL_EXT_fragment_shading_rate */ -#ifdef GL_EXT_fragment_shading_rate_attachment - if (glewExperimental || GLEW_EXT_fragment_shading_rate_attachment) GLEW_EXT_fragment_shading_rate_attachment = !_glewInit_GL_EXT_fragment_shading_rate_attachment(); -#endif /* GL_EXT_fragment_shading_rate_attachment */ -#ifdef GL_EXT_fragment_shading_rate_primitive - if (glewExperimental || GLEW_EXT_fragment_shading_rate_primitive) GLEW_EXT_fragment_shading_rate_primitive = !_glewInit_GL_EXT_fragment_shading_rate_primitive(); -#endif /* GL_EXT_fragment_shading_rate_primitive */ #ifdef GL_EXT_framebuffer_blit if (glewExperimental || GLEW_EXT_framebuffer_blit) GLEW_EXT_framebuffer_blit = !_glewInit_GL_EXT_framebuffer_blit(); #endif /* GL_EXT_framebuffer_blit */ diff --git a/src/glewinfo.c b/src/glewinfo.c index e3131bb..bf828cb 100644 --- a/src/glewinfo.c +++ b/src/glewinfo.c @@ -5096,12 +5096,7 @@ static void _glewInfo_GL_EXT_fragment_shading_rate (void) static void _glewInfo_GL_EXT_fragment_shading_rate_attachment (void) { - GLboolean fi = glewPrintExt("GL_EXT_fragment_shading_rate_attachment", GLEW_EXT_fragment_shading_rate_attachment, glewIsSupported("GL_EXT_fragment_shading_rate_attachment"), glewGetExtension("GL_EXT_fragment_shading_rate_attachment")); - - glewInfoFunc(fi, "glFramebufferShadingRateEXT", glFramebufferShadingRateEXT == NULL); - glewInfoFunc(fi, "glGetFragmentShadingRatesEXT", glGetFragmentShadingRatesEXT == NULL); - glewInfoFunc(fi, "glShadingRateCombinerOpsEXT", glShadingRateCombinerOpsEXT == NULL); - glewInfoFunc(fi, "glShadingRateEXT", glShadingRateEXT == NULL); + glewPrintExt("GL_EXT_fragment_shading_rate_attachment", GLEW_EXT_fragment_shading_rate_attachment, glewIsSupported("GL_EXT_fragment_shading_rate_attachment"), glewGetExtension("GL_EXT_fragment_shading_rate_attachment")); } #endif /* GL_EXT_fragment_shading_rate_attachment */ @@ -5110,12 +5105,7 @@ static void _glewInfo_GL_EXT_fragment_shading_rate_attachment (void) static void _glewInfo_GL_EXT_fragment_shading_rate_primitive (void) { - GLboolean fi = glewPrintExt("GL_EXT_fragment_shading_rate_primitive", GLEW_EXT_fragment_shading_rate_primitive, glewIsSupported("GL_EXT_fragment_shading_rate_primitive"), glewGetExtension("GL_EXT_fragment_shading_rate_primitive")); - - glewInfoFunc(fi, "glFramebufferShadingRateEXT", glFramebufferShadingRateEXT == NULL); - glewInfoFunc(fi, "glGetFragmentShadingRatesEXT", glGetFragmentShadingRatesEXT == NULL); - glewInfoFunc(fi, "glShadingRateCombinerOpsEXT", glShadingRateCombinerOpsEXT == NULL); - glewInfoFunc(fi, "glShadingRateEXT", glShadingRateEXT == NULL); + glewPrintExt("GL_EXT_fragment_shading_rate_primitive", GLEW_EXT_fragment_shading_rate_primitive, glewIsSupported("GL_EXT_fragment_shading_rate_primitive"), glewGetExtension("GL_EXT_fragment_shading_rate_primitive")); } #endif /* GL_EXT_fragment_shading_rate_primitive */