diff options
| author | Ian Romanick <[email protected]> | 2011-08-23 17:18:00 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-09-26 12:14:13 -0700 |
| commit | 425284e88244e63a627b3fc4ae4514f064c71a83 (patch) | |
| tree | 6679a971104165eb6e7b3ee0f03893d5254e0245 /src/mesa | |
| parent | e5301b82ff66f3acd36d9e8467ee73a6a2573695 (diff) | |
mesa: Remove OES_read_format extension enable flag
This extension is always enabled, and drivers do not have
to option to disable it.
I kept this one separate from the others because I was a little
uncertain about the changes to get.c.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/extensions.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index ba4919304a9..948027577a3 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -239,7 +239,7 @@ static const struct extension extension_table[] = { { "GL_OES_point_size_array", o(dummy_true), ES1, 2004 }, { "GL_OES_point_sprite", o(ARB_point_sprite), ES1, 2004 }, { "GL_OES_query_matrix", o(dummy_true), ES1, 2003 }, - { "GL_OES_read_format", o(OES_read_format), GL | ES1, 2003 }, + { "GL_OES_read_format", o(dummy_true), GL | ES1, 2003 }, { "GL_OES_rgb8_rgba8", o(EXT_framebuffer_object), ES1 | ES2, 2005 }, { "GL_OES_single_precision", o(dummy_true), ES1, 2003 }, { "GL_OES_standard_derivatives", o(OES_standard_derivatives), ES2, 2005 }, @@ -354,7 +354,6 @@ static const size_t default_extensions[] = { o(EXT_separate_specular_color), o(EXT_texture3D), - o(OES_read_format), o(OES_standard_derivatives), /* Vendor Extensions */ diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 3877b7167fa..99ce567cc2e 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -250,12 +250,6 @@ static const int extra_flush_current[] = { EXTRA_END }; -static const int extra_new_buffers_OES_read_format[] = { - EXTRA_NEW_BUFFERS, - EXT(OES_read_format), - EXTRA_END -}; - static const int extra_EXT_secondary_color_flush_current[] = { EXT(EXT_secondary_color), EXTRA_FLUSH_CURRENT, @@ -486,9 +480,9 @@ static const struct value_desc values[] = { /* GL_OES_read_format */ { GL_IMPLEMENTATION_COLOR_READ_TYPE_OES, LOC_CUSTOM, TYPE_INT, 0, - extra_new_buffers_OES_read_format }, + extra_new_buffers }, { GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES, LOC_CUSTOM, TYPE_INT, 0, - extra_new_buffers_OES_read_format }, + extra_new_buffers }, /* GL_EXT_framebuffer_object */ { GL_FRAMEBUFFER_BINDING_EXT, BUFFER_INT(Name), diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index a2095dc9f22..866ec0a619a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2884,7 +2884,6 @@ struct gl_extensions GLboolean NV_texture_rectangle; GLboolean NV_vertex_program; GLboolean NV_vertex_program1_1; - GLboolean OES_read_format; GLboolean SGIS_texture_lod; GLboolean TDFX_texture_compression_FXT1; GLboolean S3_s3tc; |