Mesa (master): glsl: use consistent version string format
Timothy Arceri
tarceri at kemper.freedesktop.org
Wed Jul 1 01:36:40 UTC 2015
Module: Mesa
Branch: master
Commit: 5afed936fea56a60300c6ed1228eaccf60c8cbd6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5afed936fea56a60300c6ed1228eaccf60c8cbd6
Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date: Tue Jun 23 07:47:58 2015 +1000
glsl: use consistent version string format
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
---
src/glsl/glsl_parser_extras.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 9a0c24e..02ddbbd 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -129,7 +129,7 @@ struct _mesa_glsl_parse_state {
bool check_explicit_attrib_stream_allowed(YYLTYPE *locp)
{
if (!this->has_explicit_attrib_stream()) {
- const char *const requirement = "GL_ARB_gpu_shader5 extension or GLSL 400";
+ const char *const requirement = "GL_ARB_gpu_shader5 extension or GLSL 4.00";
_mesa_glsl_error(locp, this, "explicit stream requires %s",
requirement);
@@ -144,8 +144,8 @@ struct _mesa_glsl_parse_state {
{
if (!this->has_explicit_attrib_location()) {
const char *const requirement = this->es_shader
- ? "GLSL ES 300"
- : "GL_ARB_explicit_attrib_location extension or GLSL 330";
+ ? "GLSL ES 3.00"
+ : "GL_ARB_explicit_attrib_location extension or GLSL 3.30";
_mesa_glsl_error(locp, this, "%s explicit location requires %s",
mode_string(var), requirement);
@@ -160,8 +160,8 @@ struct _mesa_glsl_parse_state {
{
if (!this->has_separate_shader_objects()) {
const char *const requirement = this->es_shader
- ? "GL_EXT_separate_shader_objects extension or GLSL ES 310"
- : "GL_ARB_separate_shader_objects extension or GLSL 420";
+ ? "GL_EXT_separate_shader_objects extension or GLSL ES 3.10"
+ : "GL_ARB_separate_shader_objects extension or GLSL 4.20";
_mesa_glsl_error(locp, this, "%s explicit location requires %s",
mode_string(var), requirement);
@@ -177,9 +177,9 @@ struct _mesa_glsl_parse_state {
if (!this->has_explicit_attrib_location() ||
!this->has_explicit_uniform_location()) {
const char *const requirement = this->es_shader
- ? "GLSL ES 310"
+ ? "GLSL ES 3.10"
: "GL_ARB_explicit_uniform_location and either "
- "GL_ARB_explicit_attrib_location or GLSL 330.";
+ "GL_ARB_explicit_attrib_location or GLSL 3.30.";
_mesa_glsl_error(locp, this,
"uniform explicit location requires %s",
More information about the mesa-commit
mailing list