OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: add enable flags for ARB_compute_variable_group_size

Browse Source 
This also initializes the default values for the standalone compiler.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Samuel Pitoiset
2016-09-07 18:05:52 +02:00
parent 45ab63c0cb
commit d5c8481d57
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/glsl/glsl_parser_extras.cpp
View File

@@ -590,6 +590,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
EXT(ARB_ES3_2_compatibility), EXT(ARB_ES3_2_compatibility),
EXT(ARB_arrays_of_arrays), EXT(ARB_arrays_of_arrays),
EXT(ARB_compute_shader), EXT(ARB_compute_shader),
EXT(ARB_compute_variable_group_size),
EXT(ARB_conservative_depth), EXT(ARB_conservative_depth),
EXT(ARB_cull_distance), EXT(ARB_cull_distance),
EXT(ARB_derivative_control), EXT(ARB_derivative_control),

2
src/compiler/glsl/glsl_parser_extras.h
View File

@@ -576,6 +576,8 @@ struct _mesa_glsl_parse_state {
bool ARB_arrays_of_arrays_warn; bool ARB_arrays_of_arrays_warn;
bool ARB_compute_shader_enable; bool ARB_compute_shader_enable;
bool ARB_compute_shader_warn; bool ARB_compute_shader_warn;
bool ARB_compute_variable_group_size_enable;
bool ARB_compute_variable_group_size_warn;
bool ARB_conservative_depth_enable; bool ARB_conservative_depth_enable;
bool ARB_conservative_depth_warn; bool ARB_conservative_depth_warn;
bool ARB_cull_distance_enable; bool ARB_cull_distance_enable;

4
src/compiler/glsl/standalone.cpp
View File

@@ -58,6 +58,10 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->Const.MaxComputeWorkGroupSize[2] = 64; ctx->Const.MaxComputeWorkGroupSize[2] = 64;
ctx->Const.MaxComputeWorkGroupInvocations = 1024; ctx->Const.MaxComputeWorkGroupInvocations = 1024;
ctx->Const.MaxComputeSharedMemorySize = 32768; ctx->Const.MaxComputeSharedMemorySize = 32768;
ctx->Const.MaxComputeVariableGroupSize[0] = 512;
ctx->Const.MaxComputeVariableGroupSize[1] = 512;
ctx->Const.MaxComputeVariableGroupSize[2] = 64;
ctx->Const.MaxComputeVariableGroupInvocations = 512;
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits = 16; ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxUniformComponents = 1024; ctx->Const.Program[MESA_SHADER_COMPUTE].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxCombinedUniformComponents = 1024; ctx->Const.Program[MESA_SHADER_COMPUTE].MaxCombinedUniformComponents = 1024;

5
src/compiler/glsl/standalone_scaffolding.cpp
View File

@@ -156,6 +156,7 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api)
ctx->Extensions.dummy_false = false; ctx->Extensions.dummy_false = false;
ctx->Extensions.dummy_true = true; ctx->Extensions.dummy_true = true;
ctx->Extensions.ARB_compute_shader = true; ctx->Extensions.ARB_compute_shader = true;
ctx->Extensions.ARB_compute_variable_group_size = true;
ctx->Extensions.ARB_conservative_depth = true; ctx->Extensions.ARB_conservative_depth = true;
ctx->Extensions.ARB_draw_instanced = true; ctx->Extensions.ARB_draw_instanced = true;
ctx->Extensions.ARB_ES2_compatibility = true; ctx->Extensions.ARB_ES2_compatibility = true;
@@ -219,6 +220,10 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api)
ctx->Const.MaxComputeWorkGroupSize[1] = 1024; ctx->Const.MaxComputeWorkGroupSize[1] = 1024;
ctx->Const.MaxComputeWorkGroupSize[2] = 64; ctx->Const.MaxComputeWorkGroupSize[2] = 64;
ctx->Const.MaxComputeWorkGroupInvocations = 1024; ctx->Const.MaxComputeWorkGroupInvocations = 1024;
ctx->Const.MaxComputeVariableGroupSize[0] = 512;
ctx->Const.MaxComputeVariableGroupSize[1] = 512;
ctx->Const.MaxComputeVariableGroupSize[2] = 64;
ctx->Const.MaxComputeVariableGroupInvocations = 512;
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits = 16; ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxUniformComponents = 1024; ctx->Const.Program[MESA_SHADER_COMPUTE].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_COMPUTE].MaxInputComponents = 0; /* not used */ ctx->Const.Program[MESA_SHADER_COMPUTE].MaxInputComponents = 0; /* not used */