mesa.git
15 years agocell: simplify the 'optional register' code
Brian Paul [Sun, 11 Jan 2009 21:06:39 +0000 (14:06 -0700)]
cell: simplify the 'optional register' code

15 years agocell: asst datatype clean-ups
Brian Paul [Sun, 11 Jan 2009 20:52:58 +0000 (13:52 -0700)]
cell: asst datatype clean-ups

15 years agocell: move depth/stencil code into separate function
Brian Paul [Sun, 11 Jan 2009 20:40:28 +0000 (13:40 -0700)]
cell: move depth/stencil code into separate function

15 years agocell: clean-up, re-indent, comments
Brian Paul [Sun, 11 Jan 2009 20:23:44 +0000 (13:23 -0700)]
cell: clean-up, re-indent, comments

15 years agocell: use tgsi_dump_instruction() instead of spe_comment()
Brian Paul [Sat, 10 Jan 2009 05:32:11 +0000 (22:32 -0700)]
cell: use tgsi_dump_instruction() instead of spe_comment()

15 years agogallium: use tgsi_dump_instruction() instead of ppc_comment()
Brian Paul [Sat, 10 Jan 2009 05:03:48 +0000 (22:03 -0700)]
gallium: use tgsi_dump_instruction() instead of ppc_comment()

15 years agogallium: remove unused struct type
Brian Paul [Sat, 10 Jan 2009 04:51:22 +0000 (21:51 -0700)]
gallium: remove unused struct type

15 years agogallium: fix register clobber bug in TGSI->PPC codegen
Brian Paul [Sat, 10 Jan 2009 04:48:54 +0000 (21:48 -0700)]
gallium: fix register clobber bug in TGSI->PPC codegen

When negating a src vector that's stored in a altivec register, need to put
negated value into a new register so we don't upset the original value.
This solves the dark colors in the mandelbrot GLSL demo.
Also, use new predicate functions to check if a TGSI temp is stored in
an altivec register.

15 years agogallium: emit comments in TGSI->PPC codegen
Brian Paul [Sat, 10 Jan 2009 04:46:08 +0000 (21:46 -0700)]
gallium: emit comments in TGSI->PPC codegen

15 years agogallium: code to dump/debug PPC code (disabled)
Brian Paul [Sat, 10 Jan 2009 04:42:58 +0000 (21:42 -0700)]
gallium: code to dump/debug PPC code (disabled)

15 years agogallium: added comment/annotation support to PPC rtasm
Brian Paul [Sat, 10 Jan 2009 04:42:17 +0000 (21:42 -0700)]
gallium: added comment/annotation support to PPC rtasm

15 years agocell: added rule to produce .s assembly files
Brian Paul [Sat, 10 Jan 2009 04:00:15 +0000 (21:00 -0700)]
cell: added rule to produce .s assembly files

15 years agogallium: s/false/FALSE/
Brian Paul [Sat, 10 Jan 2009 03:57:14 +0000 (20:57 -0700)]
gallium: s/false/FALSE/

15 years agomesa: Update .gitignore
Younes Manton [Sat, 10 Jan 2009 19:11:30 +0000 (14:11 -0500)]
mesa: Update .gitignore

15 years agonouveau: Update nv30 swizzling.
Younes Manton [Sat, 10 Jan 2009 19:09:59 +0000 (14:09 -0500)]
nouveau: Update nv30 swizzling.

15 years agonouveau: Factor out common winsys bits into libnouveaudrm.a
Younes Manton [Sat, 10 Jan 2009 18:30:29 +0000 (13:30 -0500)]
nouveau: Factor out common winsys bits into libnouveaudrm.a

15 years agog3dvl: Use Gallium thread wrappers.
Younes Manton [Sat, 20 Dec 2008 22:37:24 +0000 (17:37 -0500)]
g3dvl: Use Gallium thread wrappers.

15 years agog3dvl: Use Gallium MALLOC wrappers.
Younes Manton [Sat, 20 Dec 2008 22:09:55 +0000 (17:09 -0500)]
g3dvl: Use Gallium MALLOC wrappers.

15 years agog3dvl: Get rid of old unbuffered motion compensation code.
Younes Manton [Sat, 20 Dec 2008 21:31:29 +0000 (16:31 -0500)]
g3dvl: Get rid of old unbuffered motion compensation code.

15 years agog3dvl: Map vertex bufs once per frame/flush.
Younes Manton [Sat, 20 Dec 2008 21:30:33 +0000 (16:30 -0500)]
g3dvl: Map vertex bufs once per frame/flush.

15 years agonouveau: Catch some more leaks.
Younes Manton [Sat, 20 Dec 2008 19:42:29 +0000 (14:42 -0500)]
nouveau: Catch some more leaks.

15 years agog3dvl: Fix some memory leaks.
Younes Manton [Fri, 12 Dec 2008 04:04:51 +0000 (23:04 -0500)]
g3dvl: Fix some memory leaks.

15 years agog3dvl: Allocate one set of bufs, let winsys rename them as necessary.
Younes Manton [Thu, 11 Dec 2008 23:05:59 +0000 (18:05 -0500)]
g3dvl: Allocate one set of bufs, let winsys rename them as necessary.

15 years agonouveau: Add busy() query, determines if BOs can be mapped immediately.
Younes Manton [Thu, 11 Dec 2008 22:55:16 +0000 (17:55 -0500)]
nouveau: Add busy() query, determines if BOs can be mapped immediately.

15 years agonouveau: Use PIPE_BUFFER_USAGE_CPU_* instead of custom.
Younes Manton [Sat, 6 Dec 2008 20:45:00 +0000 (15:45 -0500)]
nouveau: Use PIPE_BUFFER_USAGE_CPU_* instead of custom.

15 years agog3dvl: Expand YCbCr to full RGB range by default.
Younes Manton [Fri, 5 Dec 2008 07:27:35 +0000 (02:27 -0500)]
g3dvl: Expand YCbCr to full RGB range by default.

15 years agog3dvl: Work around mplayer weirdness in XvMCPutSurface().
Younes Manton [Fri, 5 Dec 2008 07:27:10 +0000 (02:27 -0500)]
g3dvl: Work around mplayer weirdness in XvMCPutSurface().

15 years agog3dvl: Flag textures holding incoming data as dynamic.
Younes Manton [Fri, 5 Dec 2008 07:26:47 +0000 (02:26 -0500)]
g3dvl: Flag textures holding incoming data as dynamic.

15 years agonouveau: Put dynamic textures in GART for CPU access and don't swizzle.
Younes Manton [Fri, 5 Dec 2008 07:26:07 +0000 (02:26 -0500)]
nouveau: Put dynamic textures in GART for CPU access and don't swizzle.

Also flag shadows as dynamic since they're for CPU access as well.

15 years agogallium: Define PIPE_TEXTURE_USAGE_DYNAMIC.
Younes Manton [Fri, 5 Dec 2008 07:22:56 +0000 (02:22 -0500)]
gallium: Define PIPE_TEXTURE_USAGE_DYNAMIC.

Knowing how the client intends to use the texture will give the
driver the opportunity to optimize for such cases.

15 years agonouveau: Swizzle textures larger than nv04 SIFM limit in parts.
Younes Manton [Fri, 5 Dec 2008 07:21:55 +0000 (02:21 -0500)]
nouveau: Swizzle textures larger than nv04 SIFM limit in parts.

Limit of SIFM on nv40 is 1024x1024, not sure about others.

15 years agodraw: Add missing include.
José Fonseca [Fri, 9 Jan 2009 19:08:56 +0000 (19:08 +0000)]
draw: Add missing include.

15 years agost: build fix
Alan Hourihane [Fri, 9 Jan 2009 11:23:47 +0000 (11:23 +0000)]
st: build fix

15 years agomesa: 7.3-rc-1 Makefile changes
Brian Paul [Fri, 9 Jan 2009 00:21:20 +0000 (17:21 -0700)]
mesa: 7.3-rc-1 Makefile changes

15 years agomesa: latest glxext.h header, no version change
Brian Paul [Fri, 9 Jan 2009 00:20:41 +0000 (17:20 -0700)]
mesa: latest glxext.h header, no version change

15 years agomesa: import glext.h version 44
Brian Paul [Fri, 9 Jan 2009 00:20:18 +0000 (17:20 -0700)]
mesa: import glext.h version 44

15 years agodocs: dri2proto, libdrm tweaks
Brian Paul [Fri, 9 Jan 2009 00:19:51 +0000 (17:19 -0700)]
docs: dri2proto, libdrm tweaks

15 years agoglsl: fix typo in the vec2 += operator function
Brian Paul [Fri, 9 Jan 2009 00:07:28 +0000 (17:07 -0700)]
glsl: fix typo in the vec2 += operator function

15 years agomesa: set version string to 7.3-rc1
Brian Paul [Thu, 8 Jan 2009 23:16:36 +0000 (16:16 -0700)]
mesa: set version string to 7.3-rc1

15 years agodocs: more 7.3 doc updates
Brian Paul [Thu, 8 Jan 2009 23:14:19 +0000 (16:14 -0700)]
docs: more 7.3 doc updates

15 years agodocs: import 7.2 relnotes, start on 7.3 relnotes
Brian Paul [Thu, 8 Jan 2009 23:12:23 +0000 (16:12 -0700)]
docs: import 7.2 relnotes, start on 7.3 relnotes

15 years agoglsl: fix broken +=, -=, *=, /= operators
Brian Paul [Thu, 8 Jan 2009 22:32:02 +0000 (15:32 -0700)]
glsl: fix broken +=, -=, *=, /= operators

These functions need to return the final computed value.
Now expressions such as a = (b += c) work properly.
Also, no need to use __asm intrinsics in these functions.  The resulting
code is the same when using ordinary arithmetic operators and is more legible.

15 years agomesa: fix off-by-one bug in _mesa_delete_instructions()
Brian Paul [Wed, 7 Jan 2009 19:31:14 +0000 (12:31 -0700)]
mesa: fix off-by-one bug in _mesa_delete_instructions()

15 years agoi965: Fix GLSL FS DPH to return the right value instead of src0.w * src1.w.
Eric Anholt [Thu, 8 Jan 2009 00:56:02 +0000 (16:56 -0800)]
i965: Fix GLSL FS DPH to return the right value instead of src0.w * src1.w.

15 years agoi965: Remove worrisome comment about _NEW_PROGRAM signaling fp change.
Eric Anholt [Wed, 7 Jan 2009 22:26:11 +0000 (14:26 -0800)]
i965: Remove worrisome comment about _NEW_PROGRAM signaling fp change.

Everything now depends on either BRW_NEW_FRAGMENT_PROGRAM or
BRW_NEW_VERTEX_PROGRAM.

15 years agomesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.
Eric Anholt [Wed, 7 Jan 2009 22:09:07 +0000 (14:09 -0800)]
mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.

There was a note in state.c about _Active deserving to die, and there were
potential issues with it due to i965 forgetting to set _UseTexEnvProgram.
Removing both simplifies things.

Reviewed-by: Brian Paul <brianp@vmware.com>
15 years agoi965: Remove dead brw_vs_tnl.c
Eric Anholt [Wed, 7 Jan 2009 21:52:51 +0000 (13:52 -0800)]
i965: Remove dead brw_vs_tnl.c

15 years agoi965: allow gl_FragData[0] usage when there's only one color buffer
Brian Paul [Thu, 8 Jan 2009 01:45:49 +0000 (18:45 -0700)]
i965: allow gl_FragData[0] usage when there's only one color buffer

If gl_FragData[0] is written but not gl_FragCOlor, use the former.

15 years agomesa: additional case in file_string()
Brian Paul [Thu, 8 Jan 2009 01:44:41 +0000 (18:44 -0700)]
mesa: additional case in file_string()

15 years agoglsl: pass GLcontext::Extension info down into GLSL preprocessor
Brian Paul [Thu, 8 Jan 2009 01:44:00 +0000 (18:44 -0700)]
glsl: pass GLcontext::Extension info down into GLSL preprocessor

Now the #extension directives can be handled properly.

15 years agoglsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITY
Brian Paul [Thu, 8 Jan 2009 01:41:54 +0000 (18:41 -0700)]
glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITY

15 years agoglsl: check that the fragment shader does not write both gl_FragColor and gl_FragData[]
Brian Paul [Thu, 8 Jan 2009 01:22:56 +0000 (18:22 -0700)]
glsl: check that the fragment shader does not write both gl_FragColor and gl_FragData[]

15 years agoi965: init dst reg RelAddr field to zero
Brian Paul [Wed, 7 Jan 2009 22:06:06 +0000 (15:06 -0700)]
i965: init dst reg RelAddr field to zero

15 years agoi965: Note when we drop saturate mode on the floor in a VP.
Eric Anholt [Wed, 7 Jan 2009 20:38:34 +0000 (12:38 -0800)]
i965: Note when we drop saturate mode on the floor in a VP.

15 years agoi965: Add support for LRP in VPs.
Eric Anholt [Wed, 7 Jan 2009 20:37:58 +0000 (12:37 -0800)]
i965: Add support for LRP in VPs.

Bug #19226.

15 years agoglsl: disable some unused functions (but don't remove just yet)
Brian Paul [Wed, 7 Jan 2009 15:56:10 +0000 (08:56 -0700)]
glsl: disable some unused functions (but don't remove just yet)

15 years agoglsl: also unroll loops with variable declarations such as "for (int i = 0; ..."
Brian Paul [Wed, 7 Jan 2009 15:54:09 +0000 (08:54 -0700)]
glsl: also unroll loops with variable declarations such as "for (int i = 0; ..."

15 years agoglsl: remove dead code
Brian Paul [Wed, 7 Jan 2009 15:32:21 +0000 (08:32 -0700)]
glsl: remove dead code

15 years agomesa: OSMesa Makefile fixes (use LIB_DIR)
Brian Paul [Wed, 7 Jan 2009 15:25:59 +0000 (08:25 -0700)]
mesa: OSMesa Makefile fixes (use LIB_DIR)

15 years agoglsl: loop unroll adjustments
Brian Paul [Wed, 7 Jan 2009 00:36:20 +0000 (17:36 -0700)]
glsl: loop unroll adjustments

Add a "max complexity" heuristic to allow unrolling long loops with small
bodies and short loops with large bodies.

The loop unroll limits may need further tweaking...

15 years agoglsl: implement loop unrolling for simple 'for' loops
Brian Paul [Wed, 7 Jan 2009 00:24:23 +0000 (17:24 -0700)]
glsl: implement loop unrolling for simple 'for' loops

Loops such as this will be unrolled:
  for (i = 0; i < 4; ++i) {
      body;
  }
where 'body' isn't too large.

This also helps to fix the issue reported in bug #19190.  The problem there
is indexing vector types with a variable index.  For example:
  vec4 v;
  v[2] = 1.0;  // equivalent to v.z = 1.0
  v[i] = 2.0;  // variable index into vector!!

Since the for-i loop can be unrolled, we can avoid the problems associated
with variable indexing into a vector (at least in this case).

15 years agomesa: Move var declaration to top of scope.
Brian Paul [Tue, 6 Jan 2009 21:28:49 +0000 (14:28 -0700)]
mesa: Move var declaration to top of scope.

(cherry picked from commit 3740a06e28f4cd09e2a3dce2da60320aa9304df1)

15 years agoglut: Unlist file.
José Fonseca [Thu, 8 Jan 2009 12:42:25 +0000 (12:42 +0000)]
glut: Unlist file.

Again..

15 years agogdi: Add newline at end of file.
José Fonseca [Thu, 8 Jan 2009 12:42:00 +0000 (12:42 +0000)]
gdi: Add newline at end of file.

15 years agogallium: Replace uint64 by standard uint64_t.
José Fonseca [Thu, 8 Jan 2009 12:41:45 +0000 (12:41 +0000)]
gallium: Replace uint64 by standard uint64_t.

uint64 is not (so?) standard, and often redefined by third parties,
causing name clashes.

15 years agodraw: Predeclare struct.
José Fonseca [Thu, 8 Jan 2009 12:31:36 +0000 (12:31 +0000)]
draw: Predeclare struct.

15 years agoMerge commit 'origin/gallium-0.1' into gallium-0.2
José Fonseca [Thu, 8 Jan 2009 12:31:14 +0000 (12:31 +0000)]
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/drivers/cell/spu/spu_command.h
src/gallium/include/pipe/p_shader_tokens.h
src/mesa/main/config.h
src/mesa/main/mtypes.h
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/slang_emit.c
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/wgl/stw_wgl.h
src/mesa/state_tracker/wgl/stw_wgl_pixelformat.h

15 years agomesa: Add _mesa_snprintf.
José Fonseca [Wed, 7 Jan 2009 12:02:06 +0000 (12:02 +0000)]
mesa: Add _mesa_snprintf.

On Windows snprintf is renamed as _snprintf.

15 years agomesa: fix GL_DEPTH_CLEAR_VALUE casting
Brian Paul [Tue, 6 Jan 2009 21:21:27 +0000 (14:21 -0700)]
mesa: fix GL_DEPTH_CLEAR_VALUE casting

15 years agomesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
Brian Paul [Tue, 6 Jan 2009 21:18:45 +0000 (14:18 -0700)]
mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)

(cherry picked from commit 8124faf89d638285d8e9aa93adc3ca7f4ee729f3)

Conflicts:

src/mesa/main/get.c

15 years agomesa: Move var declaration to top of scope.
José Fonseca [Tue, 6 Jan 2009 19:18:13 +0000 (19:18 +0000)]
mesa: Move var declaration to top of scope.

15 years agowgl: Do not provide DllMain inside the state tracker.
José Fonseca [Tue, 6 Jan 2009 16:45:12 +0000 (16:45 +0000)]
wgl: Do not provide DllMain inside the state tracker.

MS CRT libraries already provide a default DllMain entrypoint, and
MS Linker will complain if it finds the same symbol in two different
libraries. Therefore the DllMain has to be in (each) winsys.

15 years agogdi: Fix warning.
José Fonseca [Tue, 6 Jan 2009 16:22:54 +0000 (16:22 +0000)]
gdi: Fix warning.

15 years agowgl: Ensure public symbols get the proper DLL linkage attributes.
José Fonseca [Tue, 6 Jan 2009 16:21:47 +0000 (16:21 +0000)]
wgl: Ensure public symbols get the proper DLL linkage attributes.

15 years agoglut: Fix build.
José Fonseca [Tue, 6 Jan 2009 16:20:23 +0000 (16:20 +0000)]
glut: Fix build.

15 years agomesa: Ensure gl* symbols are marked as dllexport on windows.
José Fonseca [Tue, 6 Jan 2009 16:20:12 +0000 (16:20 +0000)]
mesa: Ensure gl* symbols are marked as dllexport on windows.

15 years agoscons: Choose the appropriate MSVC CRT.
José Fonseca [Tue, 6 Jan 2009 16:16:38 +0000 (16:16 +0000)]
scons: Choose the appropriate MSVC CRT.

15 years agomesa: Use explicit casts when precision is lost.
José Fonseca [Tue, 6 Jan 2009 16:01:11 +0000 (16:01 +0000)]
mesa: Use explicit casts when precision is lost.

Silences MSVC.

15 years agomesa: Fix windows build when UNICODE is defined.
José Fonseca [Thu, 8 Jan 2009 12:04:03 +0000 (12:04 +0000)]
mesa: Fix windows build when UNICODE is defined.

15 years agomesa: Add _mesa_snprintf.
José Fonseca [Wed, 7 Jan 2009 12:02:06 +0000 (12:02 +0000)]
mesa: Add _mesa_snprintf.

On Windows snprintf is renamed as _snprintf.

15 years agoadd GL_READ_FRAMEBUFFER_BINDING_EXT case, regenerate get.c file
Brian Paul [Tue, 6 Jan 2009 21:23:07 +0000 (14:23 -0700)]
add GL_READ_FRAMEBUFFER_BINDING_EXT case, regenerate get.c file

(cherry picked from commit 816fbeaa813e5cdca314a39677c74c8dc700d35a)

Conflicts:

src/mesa/main/get.c

15 years agomesa: fix GL_DEPTH_CLEAR_VALUE casting
Brian Paul [Tue, 6 Jan 2009 21:21:27 +0000 (14:21 -0700)]
mesa: fix GL_DEPTH_CLEAR_VALUE casting

15 years agomesa: fix cast/conversion for optional code
Brian [Fri, 26 Sep 2008 01:57:34 +0000 (19:57 -0600)]
mesa: fix cast/conversion for optional code

(cherry picked from commit 1e3a44fab068f00378613456036716d0c3772969)

15 years agomesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
Brian Paul [Tue, 6 Jan 2009 21:18:45 +0000 (14:18 -0700)]
mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)

(cherry picked from commit 8124faf89d638285d8e9aa93adc3ca7f4ee729f3)

Conflicts:

src/mesa/main/get.c

15 years agomesa: pass ctx to link_uniform_vars() to fix build error
Brian Paul [Tue, 6 Jan 2009 20:59:14 +0000 (13:59 -0700)]
mesa: pass ctx to link_uniform_vars() to fix build error

15 years agomesa: Move var declaration to top of scope.
José Fonseca [Tue, 6 Jan 2009 19:18:13 +0000 (19:18 +0000)]
mesa: Move var declaration to top of scope.

15 years agowgl: Do not provide DllMain inside the state tracker.
José Fonseca [Tue, 6 Jan 2009 16:45:12 +0000 (16:45 +0000)]
wgl: Do not provide DllMain inside the state tracker.

MS CRT libraries already provide a default DllMain entrypoint, and
MS Linker will complain if it finds the same symbol in two different
libraries. Therefore the DllMain has to be in (each) winsys.

15 years agogdi: Fix warning.
José Fonseca [Tue, 6 Jan 2009 16:22:54 +0000 (16:22 +0000)]
gdi: Fix warning.

15 years agowgl: Ensure public symbols get the proper DLL linkage attributes.
José Fonseca [Tue, 6 Jan 2009 16:21:47 +0000 (16:21 +0000)]
wgl: Ensure public symbols get the proper DLL linkage attributes.

15 years agoglut: Fix build.
José Fonseca [Tue, 6 Jan 2009 16:20:23 +0000 (16:20 +0000)]
glut: Fix build.

15 years agomesa: Ensure gl* symbols are marked as dllexport on windows.
José Fonseca [Tue, 6 Jan 2009 16:20:12 +0000 (16:20 +0000)]
mesa: Ensure gl* symbols are marked as dllexport on windows.

15 years agoscons: Choose the appropriate MSVC CRT.
José Fonseca [Tue, 6 Jan 2009 16:16:38 +0000 (16:16 +0000)]
scons: Choose the appropriate MSVC CRT.

15 years agomesa: Use explicit casts when precision is lost.
José Fonseca [Tue, 6 Jan 2009 16:01:11 +0000 (16:01 +0000)]
mesa: Use explicit casts when precision is lost.

Silences MSVC.

15 years agomesa: fix a GLSL swizzled writemask bug
Brian Paul [Mon, 5 Jan 2009 20:12:12 +0000 (13:12 -0700)]
mesa: fix a GLSL swizzled writemask bug

This fixes cases such as:
  vec4 v4;
  vec2 v2;
  v4.xz.yx = v2;
The last line now correctly compiles into MOV TEMP[1].xz, TEMP[0].yyxw;
Helps to fix the Humus Domino demo.  See bug 19189.

(cherry picked from commit 9736d8f03364068c9ca786f88a4c2881d98d5768)

15 years agomesa: fix warning about possibly undefined var in GLSL compiler
Brian Paul [Sat, 3 Jan 2009 00:30:08 +0000 (17:30 -0700)]
mesa: fix warning about possibly undefined var in GLSL compiler

(cherry picked from commit 724ed5b84bc2491da244d091de889d5b35503b5d)

15 years agomesa: fix another "out of samplers" problem
Brian Paul [Tue, 6 Jan 2009 16:20:55 +0000 (09:20 -0700)]
mesa: fix another "out of samplers" problem

Now only the samplers that are actually used by texture() functions are
saved in the uniform variable list.  Before, we could run out of samplers
if too many were declared while only some of them were actually used.

(cherry picked from commit 1fad6ccb756ae33ca3115f59c99ca8abbeb0321e)

Conflicts:

src/mesa/shader/slang/slang_link.c

15 years agomesa: updated comments about GLSL constants
Brian Paul [Thu, 1 Jan 2009 15:07:54 +0000 (08:07 -0700)]
mesa: updated comments about GLSL constants

(cherry picked from commit dfada459aabf1a02dc2dbdb6644283fc95df2586)

15 years agomesa: fix bug in evaluation of structure fields
Brian Paul [Wed, 31 Dec 2008 00:50:39 +0000 (17:50 -0700)]
mesa: fix bug in evaluation of structure fields

Fixes incorrect size information.  See bug 19273.

(cherry picked from commit e8d7db31e2a6784c765911233cb3d888f612837f)

15 years agomesa: allow variable indexing into the predefined uniform variable arrays
Brian Paul [Wed, 31 Dec 2008 00:11:32 +0000 (17:11 -0700)]
mesa: allow variable indexing into the predefined uniform variable arrays

This allows code such as "vec4 a = gl_LightSource[i].ambient;" to work.

When a built-in uniform array is indexed with a variable index we need to
"unroll" the whole array into the parameter list (aka constant buffer) because
we don't know which elements may be accessed at compile-time.  In the case of
the gl_LightSource array of size [8], we emit 64 state references into the
parameter array (8 elements times 8 vec4s per gl_LightSourceParameters
struct).

Previously, we only allowed constant-indexed references to uniform arrays
(such as gl_LightSource[2].position) which resulted in a single state reference
being added to the parameter array, not 64.  We still optimize this case.

Users should be aware that using "gl_LightSource[i].ambient" in their shaders
is a bit expensive since state validation will involve updating all 64
light source entries in the parameter list.

(cherry picked from commit c6537ac8b8130cf2271c8d1e51137a575073c762)

15 years agomesa: better error message when running out of GLSL samplers
Brian Paul [Wed, 31 Dec 2008 00:03:09 +0000 (17:03 -0700)]
mesa: better error message when running out of GLSL samplers

(cherry picked from commit ca0540e25c86b8095511868b0cbe96d7e85f7437)