diff options
| author | marha <marha@users.sourceforge.net> | 2014-07-28 21:23:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-07-28 21:32:18 +0200 |
| commit | 777fcfa17aafab62719446e00068f5e61ec946d5 (patch) | |
| tree | ca0ed3fea46b207daa6cd5bc05382e2d60a1e87f /mesalib/src/glsl/builtin_variables.cpp | |
| parent | 61c36feba19d918885022042ea62d068a698c83d (diff) | |
| parent | b33b8d8ae86876b50df96881b96074b3fe177cce (diff) | |
| download | vcxsrv-777fcfa17aafab62719446e00068f5e61ec946d5.tar.gz vcxsrv-777fcfa17aafab62719446e00068f5e61ec946d5.tar.bz2 vcxsrv-777fcfa17aafab62719446e00068f5e61ec946d5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/src/glsl/builtin_variables.cpp')
| -rw-r--r-- | mesalib/src/glsl/builtin_variables.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/glsl/builtin_variables.cpp b/mesalib/src/glsl/builtin_variables.cpp index 34973023f..4c5b9c070 100644 --- a/mesalib/src/glsl/builtin_variables.cpp +++ b/mesalib/src/glsl/builtin_variables.cpp @@ -672,6 +672,12 @@ builtin_variable_generator::generate_constants() } if (state->is_version(430, 0) || state->ARB_compute_shader_enable) { + add_const("gl_MaxComputeAtomicCounterBuffers", MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS); + add_const("gl_MaxComputeAtomicCounters", MAX_COMPUTE_ATOMIC_COUNTERS); + add_const("gl_MaxComputeImageUniforms", MAX_COMPUTE_IMAGE_UNIFORMS); + add_const("gl_MaxComputeTextureImageUnits", MAX_COMPUTE_TEXTURE_IMAGE_UNITS); + add_const("gl_MaxComputeUniformComponents", MAX_COMPUTE_UNIFORM_COMPONENTS); + add_const_ivec3("gl_MaxComputeWorkGroupCount", state->Const.MaxComputeWorkGroupCount[0], state->Const.MaxComputeWorkGroupCount[1], |