diff options
| -rw-r--r-- | src/compiler/glsl/builtin_variables.cpp | 29 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/ir.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 1 |
6 files changed, 26 insertions, 13 deletions
diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 401c7136659..05b3b0b8a3a 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -1201,8 +1201,15 @@ builtin_variable_generator::generate_cs_special_vars() "gl_LocalInvocationID"); add_system_value(SYSTEM_VALUE_WORK_GROUP_ID, uvec3_t, "gl_WorkGroupID"); add_system_value(SYSTEM_VALUE_NUM_WORK_GROUPS, uvec3_t, "gl_NumWorkGroups"); - add_variable("gl_GlobalInvocationID", uvec3_t, ir_var_auto, 0); - add_variable("gl_LocalInvocationIndex", uint_t, ir_var_auto, 0); + if (state->ctx->Const.LowerCsDerivedVariables) { + add_variable("gl_GlobalInvocationID", uvec3_t, ir_var_auto, 0); + add_variable("gl_LocalInvocationIndex", uint_t, ir_var_auto, 0); + } else { + add_system_value(SYSTEM_VALUE_GLOBAL_INVOCATION_ID, + uvec3_t, "gl_GlobalInvocationID"); + add_system_value(SYSTEM_VALUE_LOCAL_INVOCATION_INDEX, + uint_t, "gl_LocalInvocationIndex"); + } } @@ -1431,16 +1438,16 @@ initialize_cs_derived_variables(gl_shader *shader, * These are initialized in the main function. */ void -_mesa_glsl_initialize_derived_variables(gl_shader *shader) +_mesa_glsl_initialize_derived_variables(struct gl_context *ctx, + gl_shader *shader) { /* We only need to set CS variables currently. */ - if (shader->Stage != MESA_SHADER_COMPUTE) - return; + if (shader->Stage == MESA_SHADER_COMPUTE && + ctx->Const.LowerCsDerivedVariables) { + ir_function_signature *const main_sig = + _mesa_get_main_function_signature(shader); - ir_function_signature *const main_sig = - _mesa_get_main_function_signature(shader); - if (main_sig == NULL) - return; - - initialize_cs_derived_variables(shader, main_sig); + if (main_sig != NULL) + initialize_cs_derived_variables(shader, main_sig); + } } diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 2e3395ec416..c9654acc6c1 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -1907,7 +1907,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader, } } - _mesa_glsl_initialize_derived_variables(shader); + _mesa_glsl_initialize_derived_variables(ctx, shader); delete state->symbols; ralloc_free(state); diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index e8efd27112f..93716c483de 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -2562,7 +2562,8 @@ _mesa_glsl_initialize_variables(exec_list *instructions, struct _mesa_glsl_parse_state *state); extern void -_mesa_glsl_initialize_derived_variables(gl_shader *shader); +_mesa_glsl_initialize_derived_variables(struct gl_context *ctx, + gl_shader *shader); extern void _mesa_glsl_initialize_functions(_mesa_glsl_parse_state *state); diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 97dc22621c9..ad8d5140a3f 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -599,6 +599,7 @@ brw_initialize_context_constants(struct brw_context *brw) ctx->Const.MaxClipPlanes = 8; ctx->Const.LowerTessLevel = true; + ctx->Const.LowerCsDerivedVariables = true; ctx->Const.PrimitiveRestartForPatches = true; ctx->Const.Program[MESA_SHADER_VERTEX].MaxNativeInstructions = 16 * 1024; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 22335261fb4..d0f37605f6f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3763,6 +3763,9 @@ struct gl_constants GLuint MaxTessControlTotalOutputComponents; bool LowerTessLevel; /**< Lower gl_TessLevel* from float[n] to vecn? */ bool PrimitiveRestartForPatches; + bool LowerCsDerivedVariables; /**< Lower gl_GlobalInvocationID and + * gl_LocalInvocationIndex based on + * other builtin variables. */ }; diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index d35e19f3f90..383983b26b9 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -314,6 +314,7 @@ void st_init_limits(struct pipe_screen *screen, } c->LowerTessLevel = true; + c->LowerCsDerivedVariables = true; c->PrimitiveRestartForPatches = screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES); |