mesa.git
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 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.

(cherry picked from commit f8f9a1b620d31d1a59855fd502caed325d4a324f)

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 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

(cherry picked from commit d14d494dcda3d80ec2cf452551c680ffb432e306)

15 years agomesa: remove dri_sarea.h, add glcore.h in Makefile
Brian Paul [Tue, 6 Jan 2009 14:35:45 +0000 (07:35 -0700)]
mesa: remove dri_sarea.h, add glcore.h in Makefile

15 years agomesa: Fix the size per pixel for packed pixel format data type.
Xiang, Haihao [Tue, 6 Jan 2009 07:37:45 +0000 (15:37 +0800)]
mesa: Fix the size per pixel for packed pixel format data type.

15 years agomesa: Fix the number of components for GL_UNSIGNED_SHORT_1_5_5_5_REV. (bug #19390)
Xiang, Haihao [Tue, 6 Jan 2009 07:30:34 +0000 (15:30 +0800)]
mesa: Fix the number of components for GL_UNSIGNED_SHORT_1_5_5_5_REV. (bug #19390)

15 years agodri: correct the damage.
Xiang, Haihao [Tue, 6 Jan 2009 03:22:19 +0000 (11:22 +0800)]
dri: correct the damage.

Fixes bug #17234

15 years agomesa: add GLushort cases for render to texture (Z-buffers)
Brian Paul [Tue, 6 Jan 2009 00:52:14 +0000 (17:52 -0700)]
mesa: add GLushort cases for render to texture (Z-buffers)

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.

15 years agoi965: implement OPCODE_TRUNC (round toward zero) on vertex path.
Brian Paul [Mon, 5 Jan 2009 17:09:28 +0000 (10:09 -0700)]
i965: implement OPCODE_TRUNC (round toward zero) on vertex path.

Also, fix some RNDD vs. RNDZ confusion elsewhere.

15 years agoglu: Add mangled symbols to export list
Tom Fogal [Mon, 5 Jan 2009 14:59:41 +0000 (07:59 -0700)]
glu: Add mangled symbols to export list

This adds all of the `mglu' symbols to the list of symbol exports
for GLU.  Without this patch, mangled GLU symbols are considered
`internal' symbols, and calling any results in undefined references.

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

15 years agomesa: fix another "out of samplers" problem
Brian Paul [Fri, 2 Jan 2009 19:26:15 +0000 (12:26 -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.

15 years agoi965: increase number of texture samplers to 16
Brian Paul [Thu, 1 Jan 2009 21:04:57 +0000 (14:04 -0700)]
i965: increase number of texture samplers to 16

This lets GLSL shaders use up to 16 samplers.
Fixed function is still limited to 8 textures.
Tested with progs/glsl/samplers.c

15 years agoi965: comments, clean-ups, re-order some functions
Brian Paul [Thu, 1 Jan 2009 19:03:07 +0000 (12:03 -0700)]
i965: comments, clean-ups, re-order some functions

15 years agoi965: added OPCODE_NRM3/4
Brian Paul [Thu, 1 Jan 2009 00:16:44 +0000 (17:16 -0700)]
i965: added OPCODE_NRM3/4

15 years agoi965: fix comment
Brian Paul [Thu, 1 Jan 2009 00:16:27 +0000 (17:16 -0700)]
i965: fix comment

15 years agoi965: indentation and formatting fixes
Brian Paul [Thu, 1 Jan 2009 00:01:44 +0000 (17:01 -0700)]
i965: indentation and formatting fixes

15 years agoi965: implement OPCODE_NRM3/NRM4
Brian Paul [Wed, 31 Dec 2008 23:49:58 +0000 (16:49 -0700)]
i965: implement OPCODE_NRM3/NRM4

15 years agoi965: whitespace, comment changes
Brian Paul [Wed, 31 Dec 2008 23:43:57 +0000 (16:43 -0700)]
i965: whitespace, comment changes

15 years agomesa: comments, whitespace changes
Brian Paul [Wed, 31 Dec 2008 23:38:10 +0000 (16:38 -0700)]
mesa: comments, whitespace changes

15 years agodemos: added progs/glsl/samplers.c to test all available texture samplers
Brian Paul [Thu, 1 Jan 2009 21:02:17 +0000 (14:02 -0700)]
demos: added progs/glsl/samplers.c to test all available texture samplers

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

15 years agomesa: increase max texture image units and GLSL samplers to 16
Brian Paul [Wed, 31 Dec 2008 18:54:02 +0000 (11:54 -0700)]
mesa: increase max texture image units and GLSL samplers to 16

The max texture coord units is still 8.  All the fixed-function paths are
still limited to 8 too.  But GLSL shaders can use more samplers now.

Note that some texcoord-related data structures are declared to be 16
elements in size rather than 8.  This just simplifies the code in a few
places; the extra elements aren't accessible to the user.

These changes haven't been extensively tested yet, but sanity checking has
been done.

It should be possible to increase the max image units/samplers to 32 without
doing anything special.  Beyond that we'll need longer bitfields in a few
places.

15 years agointel: Share passthrough transform setup between glBitmap and glDrawPixels.
Eric Anholt [Wed, 31 Dec 2008 08:29:49 +0000 (00:29 -0800)]
intel: Share passthrough transform setup between glBitmap and glDrawPixels.

The DrawPixels path was missing glViewport care, so blender's toolbar icons
would go to the wrong places.

Bug #19118.

15 years agointel: Add support for glBitmap as metaops using GL calls.
Eric Anholt [Wed, 31 Dec 2008 08:02:43 +0000 (00:02 -0800)]
intel: Add support for glBitmap as metaops using GL calls.

This lets us avoid software fallbacks when clients forget to turn some state
off (engine demo) or just do crazy things to test conformance (OGLC).

This should probably be brought into mesa generic code so other drivers can
make use of it.

Bug #19016.

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.

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.

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

15 years agomesa: comments for some state vars
Brian Paul [Wed, 31 Dec 2008 00:00:36 +0000 (17:00 -0700)]
mesa: comments for some state vars

15 years agomesa: increase max constants/uniforms to 256 (vec4 vectors)
Brian Paul [Wed, 31 Dec 2008 00:00:06 +0000 (17:00 -0700)]
mesa: increase max constants/uniforms to 256 (vec4 vectors)

15 years agomesa: updated compilation documentation
Brian Paul [Tue, 30 Dec 2008 14:57:16 +0000 (07:57 -0700)]
mesa: updated compilation documentation

15 years agodemos: minor fixes to twoside.c glsl demo
Brian Paul [Thu, 18 Dec 2008 23:08:42 +0000 (16:08 -0700)]
demos: minor fixes to twoside.c glsl demo

15 years agointel: disable ATI_texture_env_combine3 for i830( and related device).
Xiang, Haihao [Tue, 30 Dec 2008 03:25:45 +0000 (11:25 +0800)]
intel: disable ATI_texture_env_combine3 for i830( and related device).

Thanks to Eric for pointing it out.

15 years agodri: Fix driWaitForMSC32 when divisor >= 2 and msc < 0.
Eric Anholt [Wed, 24 Dec 2008 00:08:40 +0000 (16:08 -0800)]
dri: Fix driWaitForMSC32 when divisor >= 2 and msc < 0.

We'd come up with a negative remainder, while we were looking for the positive
version of it in the loop conditional.  And, since the "did we hit our target"
break was disabled for the target_msc == 0 ("Just make the divisor/remainder
work") path, we'd never exit.

Simplify the code by just using int64_t all over instead of trying to do it
in a u32 space.

15 years agoR300: missing semicolon
Alex Deucher [Mon, 29 Dec 2008 17:28:12 +0000 (12:28 -0500)]
R300: missing semicolon

15 years agointel: enable ATI_texture_env_combine3. Fixes #17707
Xiang, Haihao [Mon, 29 Dec 2008 01:30:41 +0000 (09:30 +0800)]
intel: enable ATI_texture_env_combine3. Fixes #17707

15 years agor300: remove the unknowns from the indx_buffer code
Dave Airlie [Sun, 28 Dec 2008 06:48:36 +0000 (16:48 +1000)]
r300: remove the unknowns from the indx_buffer code

15 years agoi915: separate the fog term from the specular color term.
Xiang, Haihao [Wed, 24 Dec 2008 01:26:46 +0000 (09:26 +0800)]
i915: separate the fog term from the specular color term.

Previously fog parameter and specular color are packed into the
same dword. Note specular color should be packed in BGRA for device,
so if fog parameter and specular color all are present, fog parameter
will dirty the alpha term of specular color. This fixes rendering
issue when playing 'Yo Frankie' on 915/945.

15 years agointel: Fix glBitmap clipping for DRI1.
Eric Anholt [Tue, 23 Dec 2008 22:45:37 +0000 (14:45 -0800)]
intel: Fix glBitmap clipping for DRI1.

15 years agoRemove third buffer support from Mesa.
Dave Airlie [Sat, 20 Dec 2008 01:38:23 +0000 (17:38 -0800)]
Remove third buffer support from Mesa.

This is part of the deprecated pageflipping infrastructure.

15 years agoAdd do_row_3d for mipmapping 3D textures
Ian Romanick [Fri, 19 Dec 2008 21:03:51 +0000 (13:03 -0800)]
Add do_row_3d for mipmapping 3D textures

Previously 3D textures were mipmapped using multiple passed through
the 2D mipmap generation code.  This had 3 disadvantages.  First, the
extra passes were slow.  Second, this required the allocation of a
temporary buffer to hold intermediate data.  Third, and most
important, the extra passes caused loss of additional bits due to
integer division / bit-shifting.

With this change, our mipmapgen conformance test passes for
non-compressed texture formats.

15 years agoFix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REV
Ian Romanick [Fri, 19 Dec 2008 20:58:01 +0000 (12:58 -0800)]
Fix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REV

15 years ago965 / GLSL: Use full precision for EXP instruction
Ian Romanick [Thu, 18 Dec 2008 22:13:26 +0000 (14:13 -0800)]
965 / GLSL: Use full precision for EXP instruction

The partial precision mode doesn't have quite enough bits of precision
to pass conformance tests.

15 years agoGLSL: The LOG2 macro doesn't have enough precision
Ian Romanick [Thu, 18 Dec 2008 22:11:06 +0000 (14:11 -0800)]
GLSL: The LOG2 macro doesn't have enough precision

It looks like the LOG2 macro only has 8 or 9 bits of precission, but
the ARB_vertex_program spec says "accurate to at least 10 bits".

15 years agointel: Fix glBitmap top/bottom clipping.
Eric Anholt [Fri, 19 Dec 2008 00:00:09 +0000 (16:00 -0800)]
intel: Fix glBitmap top/bottom clipping.

Bug #19139.

15 years agointel: Don't forget the source bitmap size when clipping the size we draw.
Eric Anholt [Thu, 18 Dec 2008 06:10:57 +0000 (22:10 -0800)]
intel: Don't forget the source bitmap size when clipping the size we draw.

15 years agointel: Update mesa state in blit operations that want post-scissor draw bounds.
Eric Anholt [Thu, 18 Dec 2008 05:18:20 +0000 (21:18 -0800)]
intel: Update mesa state in blit operations that want post-scissor draw bounds.

15 years agointel: don't clip to scissor-clipped read framebuffer bounds in copypixels.
Eric Anholt [Thu, 18 Dec 2008 05:18:00 +0000 (21:18 -0800)]
intel: don't clip to scissor-clipped read framebuffer bounds in copypixels.

15 years agointel: Move copyteximage source clipping out of copytexsubimage.
Eric Anholt [Fri, 19 Dec 2008 02:42:06 +0000 (18:42 -0800)]
intel: Move copyteximage source clipping out of copytexsubimage.

glCopyTexSubImage already gets the (correct) clipping for us, so it doesn't
need the path.  While moving the clipping out, replace the code with the mesa
path to do the same job.

15 years agomesa: Clip copytexsubimage to read framebuffer bounds, not scissor region.
Eric Anholt [Fri, 19 Dec 2008 02:31:25 +0000 (18:31 -0800)]
mesa: Clip copytexsubimage to read framebuffer bounds, not scissor region.

15 years agomesa: Correct _mesa_clip_to_region() off-by-one.
Eric Anholt [Fri, 19 Dec 2008 02:23:51 +0000 (18:23 -0800)]
mesa: Correct _mesa_clip_to_region() off-by-one.

Note how if:
x + width == xmax + 0: width -= 0
x + width == xmax + 1: width -= 0
x + width == xmax + 2: width -= 1

So, the function was clipping to [xmin, xmax+1), not [xmin, xmax) like it was
supposed to.  Same for ymax.

15 years agoglsl: Fix handling of nested parens in macro actual arguments.
Michal Krol [Thu, 18 Dec 2008 17:45:32 +0000 (18:45 +0100)]
glsl: Fix handling of nested parens in macro actual arguments.

15 years agodemos: all glutDestroyWindow() upon exit to test query object clean-up
Brian Paul [Thu, 18 Dec 2008 16:48:20 +0000 (09:48 -0700)]
demos: all glutDestroyWindow() upon exit to test query object clean-up

15 years agoi915: check WRAP_T instead of WRAP_R for cube map texture.
Xiang, Haihao [Thu, 18 Dec 2008 04:57:41 +0000 (12:57 +0800)]
i915: check WRAP_T instead of WRAP_R for cube map texture.

15 years agoi915: fix abort issue. (bug #19147)
Xiang, Haihao [Thu, 18 Dec 2008 02:07:45 +0000 (10:07 +0800)]
i915: fix abort issue. (bug #19147)

15 years agomesa: remove unneeded _mesa_reference_fragprog() call
Brian Paul [Thu, 18 Dec 2008 01:05:03 +0000 (18:05 -0700)]
mesa: remove unneeded _mesa_reference_fragprog() call

The subsequent if/else cases always call _mesa_reference_fragprog() anyway.

15 years agodri: fix for Cygwin compilation, bug 19144
Jon Turney [Thu, 18 Dec 2008 01:01:16 +0000 (18:01 -0700)]
dri: fix for Cygwin compilation, bug 19144

15 years agomesa: updated comments
Brian Paul [Wed, 17 Dec 2008 21:54:46 +0000 (14:54 -0700)]
mesa: updated comments

15 years agodemos: add test of vertex-only and fragment-only shader programs
Brian Paul [Wed, 17 Dec 2008 20:58:31 +0000 (13:58 -0700)]
demos: add test of vertex-only and fragment-only shader programs

15 years agoutil: check for frag/vertShader=0 before attaching
Brian Paul [Wed, 17 Dec 2008 20:58:05 +0000 (13:58 -0700)]
util: check for frag/vertShader=0 before attaching

15 years agomesa: disable debug output
Brian Paul [Tue, 16 Dec 2008 22:25:58 +0000 (15:25 -0700)]
mesa: disable debug output

15 years agomesa: fix some GLSL array regressions
Brian Paul [Tue, 16 Dec 2008 21:29:52 +0000 (14:29 -0700)]
mesa: fix some GLSL array regressions

array.length() wasn't working.
Swizzle mask for accessing elements of float arrays was incorrect.

15 years agomesa: rename slang_library_noise.[ch] to prog_noise.[ch] and rename functions
Brian Paul [Tue, 16 Dec 2008 01:37:39 +0000 (18:37 -0700)]
mesa: rename slang_library_noise.[ch] to prog_noise.[ch] and rename functions

The noise functions were not glsl-specific.
Also, ran indent on the code to clean it up.

15 years agomesa: updated GLSL docs
Brian Paul [Tue, 16 Dec 2008 01:30:40 +0000 (18:30 -0700)]
mesa: updated GLSL docs

15 years agoMerge branch 'glsl-1.20-v2'
Brian Paul [Tue, 16 Dec 2008 01:25:43 +0000 (18:25 -0700)]
Merge branch 'glsl-1.20-v2'

15 years agomesa: bump glsl grammar revision
Brian Paul [Tue, 16 Dec 2008 01:24:16 +0000 (18:24 -0700)]
mesa: bump glsl grammar revision

And update some copyrights.

15 years agomesa: in slang linker, replace assertion with link error when max samplers exceeded
Brian Paul [Tue, 9 Dec 2008 21:30:42 +0000 (14:30 -0700)]
mesa: in slang linker, replace assertion with link error when max samplers exceeded

15 years agodemos: updated tests/floattex.c (doesn't work just yet).
Brian Paul [Tue, 9 Dec 2008 21:29:14 +0000 (14:29 -0700)]
demos: updated tests/floattex.c (doesn't work just yet).

15 years agomesa: move _mesa_dlopen(), etc into separate dlopen.c file
Brian Paul [Tue, 9 Dec 2008 21:26:02 +0000 (14:26 -0700)]
mesa: move _mesa_dlopen(), etc into separate dlopen.c file

15 years agoglut: added GLUT_PPM_FILE env var to dump first frame to a PPM file
Brian Paul [Mon, 8 Dec 2008 22:42:54 +0000 (15:42 -0700)]
glut: added GLUT_PPM_FILE env var to dump first frame to a PPM file

Set GLUT_PPM_FILE to the desired filename.  The first frame rendered will
be written to that file.

15 years agomesa: more re-org of variable declarations in glsl compiler
Brian Paul [Tue, 16 Dec 2008 01:18:08 +0000 (18:18 -0700)]
mesa: more re-org of variable declarations in glsl compiler

15 years agomesa: more comments, clean up
Brian Paul [Mon, 15 Dec 2008 23:57:37 +0000 (16:57 -0700)]
mesa: more comments, clean up

15 years agomesa: added comments, remove unused code
Brian Paul [Mon, 15 Dec 2008 23:49:32 +0000 (16:49 -0700)]
mesa: added comments, remove unused code

15 years agomesa: checkpoint: handle uniform vars in _slang_gen_var_decl()
Brian Paul [Mon, 15 Dec 2008 23:44:55 +0000 (16:44 -0700)]
mesa: checkpoint: handle uniform vars in _slang_gen_var_decl()

This allows uniform declarations with scalar/array initializers.
The code is rough though, and will be cleaned up.

15 years agointel: stub out CompressedTexSubImage2D instead of segfaulting.
Eric Anholt [Mon, 15 Dec 2008 23:10:18 +0000 (15:10 -0800)]
intel: stub out CompressedTexSubImage2D instead of segfaulting.

15 years agoi965: Update state before checking for fallbacks in brw_try_draw_prims.
Eric Anholt [Mon, 15 Dec 2008 21:25:20 +0000 (13:25 -0800)]
i965: Update state before checking for fallbacks in brw_try_draw_prims.

This got flipped around in 7855b2aef6bd9e9c2d73260b5cd166159b2525c6.

Bug #18907.  Thanks to idr for pointing me at a nicer testcase than blender.

15 years agointel: Don't steal renderbuffer from caller in intel_miptree_create_for_region
Pierre Willenbrock [Fri, 12 Dec 2008 20:18:23 +0000 (21:18 +0100)]
intel: Don't steal renderbuffer from caller in intel_miptree_create_for_region

Fixes double-frees of some regions, once from the renderbuffer code and
once from the miptree itself.

Bug #19062

15 years agoi965: Add decode of index/vertex buffer and primitive emit.
Eric Anholt [Wed, 10 Dec 2008 20:43:58 +0000 (12:43 -0800)]
i965: Add decode of index/vertex buffer and primitive emit.

15 years agointel: Add batchbuffer assertions to hopefully catch future mistakes.
Eric Anholt [Wed, 10 Dec 2008 07:02:48 +0000 (23:02 -0800)]
intel: Add batchbuffer assertions to hopefully catch future mistakes.