summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2006-08-25 19:57:37 +0000
committerIan Romanick <[email protected]>2006-08-25 19:57:37 +0000
commit3fea5910b9db41252da28bf0ab8ed763d1a129f8 (patch)
tree0338c834d4b93a15495432e9a2beb1cc02718e74 /src/mesa/drivers/dri
parent58d080b025c52710324eb719d6e74900cb4f64bf (diff)
Add a couple of the missing GL 2.0 functions. Enable GLX protocol for
glBlendEquationSeparateEXT. Add missing enum "get" information for GL_EXT_texture_filter_anisotropic.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/common/extension_helper.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index 99186175dd7..0f762837a4f 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -178,9 +178,10 @@ static const char ReplacementCodeuiColor3fVertex3fvSUN_names[] =
"";
#endif
-#if defined(need_GL_EXT_blend_equation_separate) || defined(need_GL_ATI_blend_equation_separate)
+#if defined(need_GL_VERSION_2_0) || defined(need_GL_EXT_blend_equation_separate) || defined(need_GL_ATI_blend_equation_separate)
static const char BlendEquationSeparateEXT_names[] =
"ii\0" /* Parameter signature */
+ "glBlendEquationSeparate\0"
"glBlendEquationSeparateEXT\0"
"glBlendEquationSeparateATI\0"
"";
@@ -1046,11 +1047,10 @@ static const char ReplacementCodeuiTexCoord2fVertex3fSUN_names[] =
"";
#endif
-#if defined(need_GL_ARB_draw_buffers) || defined(need_GL_ATI_draw_buffers)
-static const char DrawBuffersARB_names[] =
- "ip\0" /* Parameter signature */
- "glDrawBuffersARB\0"
- "glDrawBuffersATI\0"
+#if defined(need_GL_ARB_shader_objects)
+static const char Uniform1fARB_names[] =
+ "if\0" /* Parameter signature */
+ "glUniform1fARB\0"
"";
#endif
@@ -4044,10 +4044,12 @@ static const char GetMapControlPointsNV_names[] =
"";
#endif
-#if defined(need_GL_ARB_shader_objects)
-static const char Uniform1fARB_names[] =
- "if\0" /* Parameter signature */
- "glUniform1fARB\0"
+#if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_draw_buffers) || defined(need_GL_ATI_draw_buffers)
+static const char DrawBuffersARB_names[] =
+ "ip\0" /* Parameter signature */
+ "glDrawBuffers\0"
+ "glDrawBuffersARB\0"
+ "glDrawBuffersATI\0"
"";
#endif
@@ -4724,6 +4726,7 @@ static const struct dri_extension_function GL_ARB_shader_objects_functions[] = {
{ CreateProgramObjectARB_names, CreateProgramObjectARB_remap_index, -1 },
{ Uniform3iARB_names, Uniform3iARB_remap_index, -1 },
{ CreateShaderObjectARB_names, CreateShaderObjectARB_remap_index, -1 },
+ { Uniform1fARB_names, Uniform1fARB_remap_index, -1 },
{ AttachObjectARB_names, AttachObjectARB_remap_index, -1 },
{ UniformMatrix2fvARB_names, UniformMatrix2fvARB_remap_index, -1 },
{ GetAttachedObjectsARB_names, GetAttachedObjectsARB_remap_index, -1 },
@@ -4751,7 +4754,6 @@ static const struct dri_extension_function GL_ARB_shader_objects_functions[] = {
{ GetObjectParameterivARB_names, GetObjectParameterivARB_remap_index, -1 },
{ GetUniformLocationARB_names, GetUniformLocationARB_remap_index, -1 },
{ GetShaderSourceARB_names, GetShaderSourceARB_remap_index, -1 },
- { Uniform1fARB_names, Uniform1fARB_remap_index, -1 },
{ Uniform1fvARB_names, Uniform1fvARB_remap_index, -1 },
{ Uniform3fARB_names, Uniform3fARB_remap_index, -1 },
{ GetObjectParameterfvARB_names, GetObjectParameterfvARB_remap_index, -1 },
@@ -5994,9 +5996,11 @@ static const struct dri_extension_function GL_VERSION_1_5_functions[] = {
#if defined(need_GL_VERSION_2_0)
static const struct dri_extension_function GL_VERSION_2_0_functions[] = {
+ { BlendEquationSeparateEXT_names, BlendEquationSeparateEXT_remap_index, -1 },
{ StencilMaskSeparate_names, StencilMaskSeparate_remap_index, -1 },
{ StencilOpSeparate_names, StencilOpSeparate_remap_index, -1 },
{ StencilFuncSeparate_names, StencilFuncSeparate_remap_index, -1 },
+ { DrawBuffersARB_names, DrawBuffersARB_remap_index, -1 },
{ NULL, 0, 0 }
};
#endif