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

glsl: recognize GLSL 4.60

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Samuel Pitoiset
2017-08-01 12:26:29 +02:00
parent 185ef06fd2
commit 1f4ceb8be1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,9 +54,9 @@ glsl_compute_version_string(void *mem_ctx, bool is_es, unsigned version)
static const unsigned known_desktop_glsl_versions[] = static const unsigned known_desktop_glsl_versions[] =
{ 110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440, 450 }; { 110, 120, 130, 140, 150, 330, 400, 410, 420, 430, 440, 450, 460 };
static const unsigned known_desktop_gl_versions[] = static const unsigned known_desktop_gl_versions[] =
{ 20, 21, 30, 31, 32, 33, 40, 41, 42, 43, 44, 45 }; { 20, 21, 30, 31, 32, 33, 40, 41, 42, 43, 44, 45, 46 };
_mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,

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

@@ -354,7 +354,7 @@ struct _mesa_glsl_parse_state {
unsigned ver; unsigned ver;
uint8_t gl_ver; uint8_t gl_ver;
bool es; bool es;
} supported_versions[16]; } supported_versions[17];
bool es_shader; bool es_shader;
bool compat_shader; bool compat_shader;

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

@@ -253,6 +253,7 @@ initialize_context(struct gl_context *ctx, gl_api api)
case 430: case 430:
case 440: case 440:
case 450: case 450:
case 460:
ctx->Const.MaxClipPlanes = 8; ctx->Const.MaxClipPlanes = 8;
ctx->Const.MaxDrawBuffers = 8; ctx->Const.MaxDrawBuffers = 8;
ctx->Const.MinProgramTexelOffset = -8; ctx->Const.MinProgramTexelOffset = -8;
@@ -418,6 +419,7 @@ standalone_compile_shader(const struct standalone_options *_options,
case 430: case 430:
case 440: case 440:
case 450: case 450:
case 460:
glsl_es = false; glsl_es = false;
break; break;
default: default: