From: Ian Romanick <ian.d.roman...@intel.com>
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/glsl/glcpp/glcpp-parse.y | 4 +---
src/glsl/glsl_parser_extras.cpp | 2 +-
src/mesa/drivers/common/meta.c | 19 ++++++++-----------
src/mesa/main/extensions.c | 2 +-
src/mesa/main/get.c | 1 -
src/mesa/main/get_hash_params.py | 2 +-
src/mesa/main/mtypes.h | 1 -
src/mesa/main/shaderapi.c | 6 ------
8 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index f28d853..412d571 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -2069,6 +2069,7 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t
*parser, intmax_t versio
}
} else {
add_builtin_define(parser, "GL_ARB_draw_buffers", 1);
+ add_builtin_define(parser, "GL_ARB_separate_shader_objects", 1);
add_builtin_define(parser, "GL_ARB_texture_rectangle", 1);
add_builtin_define(parser, "GL_AMD_shader_trinary_minmax", 1);
@@ -2134,9 +2135,6 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t
*parser, intmax_t versio
if (extensions->ARB_texture_gather)
add_builtin_define(parser, "GL_ARB_texture_gather", 1);
- if (extensions->ARB_separate_shader_objects)
- add_builtin_define(parser, "GL_ARB_separate_shader_objects",
1);
-
if (extensions->ARB_shader_atomic_counters)
add_builtin_define(parser, "GL_ARB_shader_atomic_counters", 1);
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 61ae621..8b2af66 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -512,7 +512,7 @@ static const _mesa_glsl_extension
_mesa_glsl_supported_extensions[] = {
EXT(ARB_fragment_coord_conventions, true, false,
ARB_fragment_coord_conventions),
EXT(ARB_texture_rectangle, true, false, dummy_true),
EXT(EXT_texture_array, true, false, EXT_texture_array),
- EXT(ARB_separate_shader_objects, true, false,
ARB_separate_shader_objects),
+ EXT(ARB_separate_shader_objects, true, false, dummy_true),
EXT(ARB_shader_texture_lod, true, false,
ARB_shader_texture_lod),
EXT(ARB_shader_stencil_export, true, false,
ARB_shader_stencil_export),
EXT(AMD_conservative_depth, true, false,
ARB_conservative_depth),
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 18d8a57..9b87ef0 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -536,16 +536,14 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_set_enable(ctx, GL_FRAGMENT_SHADER_ATI, GL_FALSE);
}
- if (ctx->Extensions.ARB_separate_shader_objects) {
- /* Warning: This must be done before saving the current programs.
- * Otherwise the programs attached to the pipeline will be saved
- * instead of the programs attached to the default pipeline.
- */
- if (ctx->Pipeline.Current != ctx->Pipeline.Default) {
- _mesa_reference_pipeline_object(ctx, &save->Pipeline,
- ctx->Pipeline.Current);
- _mesa_BindProgramPipeline(0);
- }
+ /* Warning: This must be done before saving the current programs.
+ * Otherwise the programs attached to the pipeline will be saved
+ * instead of the programs attached to the default pipeline.
+ */
+ if (ctx->Pipeline.Current != ctx->Pipeline.Default) {
+ _mesa_reference_pipeline_object(ctx, &save->Pipeline,
+ ctx->Pipeline.Current);
+ _mesa_BindProgramPipeline(0);
}
for (i = 0; i < MESA_SHADER_STAGES; i++) {
@@ -917,7 +915,6 @@ _mesa_meta_end(struct gl_context *ctx)
* instead of to the default pipeline.
*/
if (save->Pipeline) {
- assert(ctx->Extensions.ARB_separate_shader_objects);
_mesa_bind_pipeline(ctx, save->Pipeline);
_mesa_reference_pipeline_object(ctx, &save->Pipeline, NULL);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index a72284c..a066d78b0 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -127,7 +127,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_sample_shading", o(ARB_sample_shading),
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_separate_shader_objects",
o(ARB_separate_shader_objects), GL, 2010 },
+ { "GL_ARB_separate_shader_objects", o(dummy_true),
GL, 2010 },
{ "GL_ARB_shader_atomic_counters",
o(ARB_shader_atomic_counters), GL, 2011 },
{ "GL_ARB_shader_bit_encoding", o(ARB_shader_bit_encoding),
GL, 2010 },
{ "GL_ARB_shader_image_load_store",
o(ARB_shader_image_load_store), GL, 2011 },
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 6d95790..e22557c 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -387,7 +387,6 @@ EXTRA_EXT(ARB_texture_cube_map_array);
EXTRA_EXT(ARB_texture_buffer_range);
EXTRA_EXT(ARB_texture_multisample);
EXTRA_EXT(ARB_texture_gather);
-EXTRA_EXT(ARB_separate_shader_objects);
EXTRA_EXT(ARB_shader_atomic_counters);
EXTRA_EXT(ARB_draw_indirect);
EXTRA_EXT(ARB_shader_image_load_store);
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 06d0bba..1d56502 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -727,7 +727,7 @@ descriptor=[
[ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB",
"CONTEXT_INT(Const.MaxProgramTextureGatherComponents),
extra_ARB_texture_gather"],
# GL_ARB_separate_shader_objects
- [ "PROGRAM_PIPELINE_BINDING", "LOC_CUSTOM, TYPE_INT,
GL_PROGRAM_PIPELINE_BINDING, extra_ARB_separate_shader_objects" ],
+ [ "PROGRAM_PIPELINE_BINDING", "LOC_CUSTOM, TYPE_INT,
GL_PROGRAM_PIPELINE_BINDING, NO_EXTRA" ],
# GL_ARB_shader_atomic_counters
[ "ATOMIC_COUNTER_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0,
extra_ARB_shader_atomic_counters" ],
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 33cb888..08d9517 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3518,7 +3518,6 @@ struct gl_extensions
GLboolean ARB_point_sprite;
GLboolean ARB_sample_shading;
GLboolean ARB_seamless_cube_map;
- GLboolean ARB_separate_shader_objects;
GLboolean ARB_shader_atomic_counters;
GLboolean ARB_shader_bit_encoding;
GLboolean ARB_shader_image_load_store;
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 1c8e6b4..8368ec5 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -700,9 +700,6 @@ get_programiv(struct gl_context *ctx, GLuint program,
GLenum pname, GLint *param
return;
}
case GL_PROGRAM_SEPARABLE:
- if (!ctx->Extensions.ARB_separate_shader_objects)
- break;
-
*params = shProg->SeparateShader;
return;
default:
@@ -1777,9 +1774,6 @@ _mesa_ProgramParameteri(GLuint program, GLenum pname,
GLint value)
return;
case GL_PROGRAM_SEPARABLE:
- if (!ctx->Extensions.ARB_separate_shader_objects)
- break;
-
/* Spec imply that the behavior is the same as ARB_get_program_binary
* Chapter 7.3 Program Objects
*/
--
1.8.1.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
