More GLSL code:

- add texture sampling support;
- fix assembly codegen bugs;

1 files changed, 44 insertions, 22 deletions

diff --git a/src/mesa/shader/slang/library/slang_common_builtin.gc b/src/mesa/shader/slang/library/slang_common_builtin.gc
index 4d82d54c14..9486f4c830 100755
--- a/src/mesa/shader/slang/library/slang_common_builtin.gc
+++ b/src/mesa/shader/slang/library/slang_common_builtin.gc
@@ -1,10 +1,27 @@
-
-//
-// TODO:
-// - implement texture1D, texture3D, textureCube,
-// - implement shadow1D, shadow2D,
-//
-
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5

+ *

+ * Copyright (C) 2006  Brian Paul   All Rights Reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included

+ * in all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ */

+

 //
 // From Shader Spec, ver. 1.10, rev. 59
 //
@@ -1267,8 +1284,9 @@ bvec4 not (bvec4 v) {
 //
 
 vec4 texture1D (sampler1D sampler, float coord) {

-    // XXX:
-    return vec4 (0.0);
+    vec4 texel;

+    __asm vec4_tex1d texel, sampler, coord, 0.0;

+    return texel;
 }

 
 vec4 texture1DProj (sampler1D sampler, vec2 coord) {
@@ -1281,7 +1299,7 @@ vec4 texture1DProj (sampler1D sampler, vec4 coord) {
 
 vec4 texture2D (sampler2D sampler, vec2 coord) {

     vec4 texel;

-    __asm vec4_tex2d texel, sampler, coord;

+    __asm vec4_tex2d texel, sampler, coord, 0.0;

     return texel;
 }

 
@@ -1294,8 +1312,9 @@ vec4 texture2DProj (sampler2D sampler, vec4 coord) {
 }
 
 vec4 texture3D (sampler3D sampler, vec3 coord) {

-    // XXX:
-    return vec4 (0.0);
+    vec4 texel;

+    __asm vec4_tex3d texel, sampler, coord, 0.0;

+    return texel;
 }

 
 vec4 texture3DProj (sampler3D sampler, vec4 coord) {

@@ -1303,22 +1322,25 @@ vec4 texture3DProj (sampler3D sampler, vec4 coord) {
 }
 
 vec4 textureCube (samplerCube sampler, vec3 coord) {

-    // XXX:
-    return vec4 (0.0);
+    vec4 texel;

+    __asm vec4_texcube texel, sampler, coord, 0.0;

+    return texel;
 }
 
 vec4 shadow1D (sampler1DShadow sampler, vec3 coord) {

-    // XXX:
-    return vec4 (0.0);
+    vec4 texel;

+    __asm vec4_shad1d texel, sampler, coord, 0.0;

+    return texel;
 }
 
-vec4 shadow2D (sampler2DShadow sampler, vec3 coord) {

-    // XXX:
-    return vec4 (0.0);
-}

-
 vec4 shadow1DProj (sampler1DShadow sampler, vec4 coord) {

-    return shadow1D (sampler, vec3 (coord.s / coord.q, 0.0, coord.p / coord.q));
+    return shadow1D (sampler, vec3 (coord.s / coord.q, 0.0, coord.p / coord.q));

+}

+

+vec4 shadow2D (sampler2DShadow sampler, vec3 coord) {

+    vec4 texel;

+    __asm vec4_shad2d texel, sampler, coord, 0.0;

+    return texel;
 }

 
 vec4 shadow2DProj (sampler2DShadow sampler, vec4 coord) {