From 071357096e682e9af59ad45ea5abc444ab431837 Mon Sep 17 00:00:00 2001
From: Michal Krol <mjkrol@gmail.org>
Date: Tue, 21 Mar 2006 10:37:40 +0000
Subject: GLSL fixes: - generate error on NULL pointers in glShaderSourceARB; -
 reinstall program object, if current, in glLinkProgramARB; - vertex and
 fragment shaders are optional in program object; - floor asm was wrongly
 computed for x86 back-end; - allow for (void) idiom in function prototypes; -
 all fixed-state uniforms are updated; - local variable initializers are
 working; - implement texture* and shadow* functions for vertex processor; -
 generate error if too many arguments in general constructor; - trim unused
 data in general constructor; - struct r-value field select was badly
 relocated;

Changes:
- add derived state gl_fog_attrib::_Scale;
- add derived state gl_light::_CosCutoffNeg;
---
 src/mesa/shader/slang/library/slang_core.gc | 35 ++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 8 deletions(-)

(limited to 'src/mesa/shader/slang/library/slang_core.gc')

diff --git a/src/mesa/shader/slang/library/slang_core.gc b/src/mesa/shader/slang/library/slang_core.gc
index 40db02a263..c96fc0a318 100755
--- a/src/mesa/shader/slang/library/slang_core.gc
+++ b/src/mesa/shader/slang/library/slang_core.gc
@@ -1,3 +1,26 @@
+/*
+ * 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.
+ */
 
 //
 // This file defines nearly all constructors and operators for built-in data types, using
@@ -1386,15 +1409,13 @@ void __operator ++ (inout mat4 m) {
 //
 
 float __operator -- (inout float a, const int) {
-    float b;
-    b = a;
+    float b = a;
     --a;
     return b;
 }
 
 int __operator -- (inout int a, const int) {
-    int b;
-    b = a;
+    int b = a;
     --a;
     return b;
 }
@@ -1436,15 +1457,13 @@ mat4 __operator -- (inout mat4 m, const int) {
 }
 
 float __operator ++ (inout float a, const int) {
-    float b;
-    b = a;
+    float b = a;
     ++a;
     return b;
 }
 
 int __operator ++ (inout int a, const int) {
-    int b;
-    b = a;
+    int b = a;
     ++a;
     return b;
 }
-- 
cgit v1.2.3