The name of both the GLSL built-in variable and the glGetInteger param
with the same value changed in GLSL ES 3.1 and GL 4.5. Its semantics
also changed slightly, since the limit now also takes into account the
number of SSBs in use. Switch our internal data structures to the
up-to-date name.
---
src/glsl/builtin_variables.cpp | 2 +-
src/glsl/glsl_parser_extras.cpp | 2 +-
src/glsl/glsl_parser_extras.h | 2 +-
src/glsl/linker.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_context.c | 2 +-
src/mesa/main/get_hash_params.py | 2 +-
src/mesa/main/mtypes.h | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 53d3500..c6fdccf 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -749,7 +749,7 @@ builtin_variable_generator::generate_constants()
add_const("gl_MaxImageUnits",
state->Const.MaxImageUnits);
add_const("gl_MaxCombinedImageUnitsAndFragmentOutputs",
- state->Const.MaxCombinedImageUnitsAndFragmentOutputs);
+ state->Const.MaxCombinedShaderOutputResources);
add_const("gl_MaxImageSamples",
state->Const.MaxImageSamples);
add_const("gl_MaxVertexImageUniforms",
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 46896d7..82b92b1 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -141,7 +141,7 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct
gl_context *_ctx,
this->Const.MaxComputeWorkGroupSize[i] =
ctx->Const.MaxComputeWorkGroupSize[i];
this->Const.MaxImageUnits = ctx->Const.MaxImageUnits;
- this->Const.MaxCombinedImageUnitsAndFragmentOutputs =
ctx->Const.MaxCombinedImageUnitsAndFragmentOutputs;
+ this->Const.MaxCombinedShaderOutputResources =
ctx->Const.MaxCombinedShaderOutputResources;
this->Const.MaxImageSamples = ctx->Const.MaxImageSamples;
this->Const.MaxVertexImageUniforms =
ctx->Const.Program[MESA_SHADER_VERTEX].MaxImageUniforms;
this->Const.MaxTessControlImageUniforms =
ctx->Const.Program[MESA_SHADER_TESS_CTRL].MaxImageUniforms;
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index eb325f0..7128fc0 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -390,7 +390,7 @@ struct _mesa_glsl_parse_state {
/* ARB_shader_image_load_store */
unsigned MaxImageUnits;
- unsigned MaxCombinedImageUnitsAndFragmentOutputs;
+ unsigned MaxCombinedShaderOutputResources;
unsigned MaxImageSamples;
unsigned MaxVertexImageUniforms;
unsigned MaxTessControlImageUniforms;
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index a7cd820..47f7d25 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2900,7 +2900,7 @@ check_image_resources(struct gl_context *ctx, struct
gl_shader_program *prog)
linker_error(prog, "Too many combined image uniforms\n");
if (total_image_units + fragment_outputs >
- ctx->Const.MaxCombinedImageUnitsAndFragmentOutputs)
+ ctx->Const.MaxCombinedShaderOutputResources)
linker_error(prog, "Too many combined image uniforms and fragment
outputs\n");
}
diff --git a/src/mesa/drivers/dri/i965/brw_context.c
b/src/mesa/drivers/dri/i965/brw_context.c
index f428f58..907b2a0 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -513,7 +513,7 @@ brw_initialize_context_constants(struct brw_context *brw)
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxImageUniforms =
BRW_MAX_IMAGES;
ctx->Const.MaxImageUnits = MAX_IMAGE_UNITS;
- ctx->Const.MaxCombinedImageUnitsAndFragmentOutputs =
+ ctx->Const.MaxCombinedShaderOutputResources =
MAX_IMAGE_UNITS + BRW_MAX_DRAW_BUFFERS;
ctx->Const.MaxImageSamples = 0;
ctx->Const.MaxCombinedImageUniforms = 3 * BRW_MAX_IMAGES;
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 7dc92f1..517c391 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -806,7 +806,7 @@ descriptor=[
[ "MAX_VERTEX_ATTRIB_BINDINGS",
"CONTEXT_ENUM(Const.MaxVertexAttribBindings), NO_EXTRA" ],
# GL_ARB_shader_image_load_store
- [ "MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS",
"CONTEXT_INT(Const.MaxCombinedImageUnitsAndFragmentOutputs),
extra_ARB_shader_image_load_store" ],
+ [ "MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS",
"CONTEXT_INT(Const.MaxCombinedShaderOutputResources),
extra_ARB_shader_image_load_store" ],
[ "MAX_IMAGE_SAMPLES", "CONTEXT_INT(Const.MaxImageSamples),
extra_ARB_shader_image_load_store" ],
[ "MAX_GEOMETRY_IMAGE_UNIFORMS",
"CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxImageUniforms),
extra_ARB_shader_image_load_store_and_geometry_shader"],
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 4e00fb6..06b1aec 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3777,7 +3777,7 @@ struct gl_constants
/* GL_ARB_shader_image_load_store */
GLuint MaxImageUnits;
- GLuint MaxCombinedImageUnitsAndFragmentOutputs;
+ GLuint MaxCombinedShaderOutputResources;
GLuint MaxImageSamples;
GLuint MaxCombinedImageUniforms;
--
2.4.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
