Mesa (master): glsl: Expose built-in packing functions under GLSL 4.2.

Matt Turner mattst88 at kemper.freedesktop.org
Fri Mar 13 17:42:47 UTC 2015


Module: Mesa
Branch: master
Commit: 8d3aa5926b73c67c7dbd4477b7177aaa00c533e5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d3aa5926b73c67c7dbd4477b7177aaa00c533e5

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Mar 11 18:14:28 2015 -0700

glsl: Expose built-in packing functions under GLSL 4.2.

ARB_shading_language_packing is part of GLSL 4.2, not 4.0 as I
mistakenly believed. The following functions are available only with
ARB_shading_language_packing, GLSL 4.2 (not GLSL 4.0), or ES 3.0:

   - packSnorm2x16
   - unpackSnorm2x16
   - packHalf2x16
   - unpackHalf2x16

Reviewed-by: Carl Worth <cworth at cworth.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/glsl/builtin_functions.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
index 84bbdc2..c607572 100644
--- a/src/glsl/builtin_functions.cpp
+++ b/src/glsl/builtin_functions.cpp
@@ -201,7 +201,7 @@ static bool
 shader_packing_or_es3(const _mesa_glsl_parse_state *state)
 {
    return state->ARB_shading_language_packing_enable ||
-          state->is_version(400, 300);
+          state->is_version(420, 300);
 }
 
 static bool




More information about the mesa-commit mailing list