diff options
| author | Pauli Nieminen <[email protected]> | 2012-06-12 21:38:55 +0300 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-08-01 15:31:17 -0700 |
| commit | 8129dabb5f5ff717bb1ca32710ca6204d5345461 (patch) | |
| tree | 9aa7deb1816dd3ea1970799033716d55d0bc6841 /src/mesa/main | |
| parent | ae58f9696c5f82c98767b3f244b2ad4b966905e5 (diff) | |
mesa: Make ARB_sampler_objects mandatory
To allow meta acceleration operations to use sampler objects the
ARB_sampler_objects extension needs to be mandatory for all drivers.
Because the extension doesn't have any hardware dependencies it is
trivial to implement.
Signed-off-by: Pauli Nieminen <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index a7b481ca771..5e13a935730 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -113,7 +113,7 @@ static const struct extension extension_table[] = { { "GL_ARB_point_sprite", o(ARB_point_sprite), GL, 2003 }, { "GL_ARB_provoking_vertex", o(EXT_provoking_vertex), GL, 2009 }, { "GL_ARB_robustness", o(dummy_true), GL, 2010 }, - { "GL_ARB_sampler_objects", o(ARB_sampler_objects), GL, 2009 }, + { "GL_ARB_sampler_objects", o(dummy_true), GL, 2009 }, { "GL_ARB_seamless_cube_map", o(ARB_seamless_cube_map), GL, 2009 }, { "GL_ARB_shader_bit_encoding", o(ARB_shader_bit_encoding), GL, 2010 }, { "GL_ARB_shader_objects", o(ARB_shader_objects), GL, 2002 }, diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index b9c98fb22d3..16ad2c4302d 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -284,11 +284,6 @@ static const int extra_GLSL_130[] = { EXTRA_END }; -static const int extra_ARB_sampler_objects[] = { - EXT(ARB_sampler_objects), - EXTRA_END -}; - static const int extra_ARB_uniform_buffer_object_and_geometry_shader[] = { EXT(ARB_uniform_buffer_object), EXT(ARB_geometry_shader4), @@ -1304,7 +1299,7 @@ static const struct value_desc values[] = { /* GL_ARB_sampler_objects / GL 3.3 */ { GL_SAMPLER_BINDING, - LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, extra_ARB_sampler_objects }, + LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, NO_EXTRA }, /* GL 3.0 */ { GL_NUM_EXTENSIONS, LOC_CUSTOM, TYPE_INT, 0, extra_version_30 }, diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 68e05a605fb..e8adac99d9d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2965,7 +2965,6 @@ struct gl_extensions GLboolean ARB_occlusion_query; GLboolean ARB_occlusion_query2; GLboolean ARB_point_sprite; - GLboolean ARB_sampler_objects; GLboolean ARB_seamless_cube_map; GLboolean ARB_shader_bit_encoding; GLboolean ARB_shader_objects; diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 91ef2dff4dd..85e623142d4 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -170,12 +170,12 @@ compute_version(struct gl_context *ctx) ctx->Extensions.ARB_explicit_attrib_location && ctx->Extensions.ARB_instanced_arrays && ctx->Extensions.ARB_occlusion_query2 && - ctx->Extensions.ARB_sampler_objects && ctx->Extensions.ARB_shader_bit_encoding && ctx->Extensions.ARB_texture_rgb10_a2ui && ctx->Extensions.ARB_timer_query && ctx->Extensions.ARB_vertex_type_2_10_10_10_rev && ctx->Extensions.EXT_texture_swizzle); + /* ARB_sampler_objects is always enabled in mesa */ if (ver_3_3) { major = 3; |