Brian Paul [Mon, 12 Jan 2009 15:52:54 +0000 (08:52 -0700)]
glsl: better fix for for-loop scope issue (commit
6333005f7aea3e5d1d86a5c47b3fa2a1ed2f3ff0)
Brian Paul [Mon, 12 Jan 2009 15:35:53 +0000 (08:35 -0700)]
windows: added new sources for 7.3 (may be more, needs testing)
Brian Paul [Mon, 12 Jan 2009 14:55:14 +0000 (07:55 -0700)]
mesa: add osmesa.pc.in to tarball list
Matthieu Herrb [Sun, 11 Jan 2009 23:56:34 +0000 (16:56 -0700)]
Build fixes for gcc 2.95
Matthieu Herrb [Sat, 11 Oct 2008 06:51:43 +0000 (08:51 +0200)]
Big endian fixes.
Matthieu Herrb [Sun, 21 Sep 2008 08:56:57 +0000 (10:56 +0200)]
build fix on big endian OpenBSD architectures.
Matthieu Herrb [Sun, 14 Sep 2008 18:58:29 +0000 (20:58 +0200)]
replace nearbyint() by rint() for now.
Owain G. Ainsworth [Sun, 11 Jan 2009 20:40:07 +0000 (20:40 +0000)]
Fix build with GCC 2.95.
Matthieu Herrb [Sat, 13 Sep 2008 17:07:28 +0000 (19:07 +0200)]
__builtin_expect is a gcc 3.x feature. define it out for gcc 2.95.
Patch suggested by miod@. Thanks.
Brian [Sat, 10 Jan 2009 23:32:32 +0000 (16:32 -0700)]
mesa: require libdrm 2.4.3 in configure.ac
Brian Paul [Sat, 10 Jan 2009 19:21:37 +0000 (12:21 -0700)]
mesa: omit old headers from tarball
Brian Paul [Sat, 10 Jan 2009 19:09:08 +0000 (12:09 -0700)]
docs: document deprecated/removed headers/interfaces
Brian Paul [Sat, 10 Jan 2009 19:07:58 +0000 (12:07 -0700)]
mesa: remove old GLView.h header for BeOS
Brian Paul [Sat, 10 Jan 2009 19:06:29 +0000 (12:06 -0700)]
mesa: remove deprecated headers from Makefile.am
Brian Paul [Sat, 10 Jan 2009 19:04:39 +0000 (12:04 -0700)]
mesa: deprecate GL/amesa.h header (allegro driver)
Brian Paul [Sat, 10 Jan 2009 19:01:40 +0000 (12:01 -0700)]
mesa: deprecate the GL/fxmesa.h header
Brian Paul [Sat, 10 Jan 2009 19:00:27 +0000 (12:00 -0700)]
mesa: remove the ancient include/GL/ugl*.h headers
Brian Paul [Sat, 10 Jan 2009 18:57:13 +0000 (11:57 -0700)]
xmesa: deprecate the "XMesa" interface
Move the include/GL/xmesa*.h files to src/mesa/drivers/x11/ so they're no
longer considered public.
Brian Paul [Sat, 10 Jan 2009 18:52:55 +0000 (11:52 -0700)]
docs: prerequisite updates
Brian Paul [Sat, 10 Jan 2009 18:40:20 +0000 (11:40 -0700)]
glsl: force creation of new scope for for-loop body
Fixes regression in progs/demos/convolution.c due to loop unrolling.
This also allows the following to be compiled correctly:
for (int i = 0; i < n; i++) {
int i;
...
}
This fix is a bit of a hack, however. The better fix would be to change
the slang_shader.syn grammar. Will revisit that...
Brian Paul [Sat, 10 Jan 2009 18:39:05 +0000 (11:39 -0700)]
glsl: replace 0/1 with GL_FALSE/GL_TRUE
Ian Romanick [Fri, 9 Jan 2009 21:56:44 +0000 (13:56 -0800)]
swrast: Fix GL_ATI_separate_stencil
GL_ATI_separate_stencil is enabled by default for software
rasterizers, but the extension functions weren't hooked up to the
dispatch table.
Brian Paul [Fri, 9 Jan 2009 16:59:49 +0000 (09:59 -0700)]
glsl: make minimum struct size = 2, not 1
1-component structs such as "struct foo { float x; }" could get placed at
any position within a register. This caused some trouble computing the
field offset which assumed all struct objects were placed at R.x.
It would be unusual to hit this case in normal shaders.
Brian Paul [Fri, 9 Jan 2009 00:21:20 +0000 (17:21 -0700)]
mesa: 7.3-rc-1 Makefile changes
Brian Paul [Fri, 9 Jan 2009 00:20:41 +0000 (17:20 -0700)]
mesa: latest glxext.h header, no version change
Brian Paul [Fri, 9 Jan 2009 00:20:18 +0000 (17:20 -0700)]
mesa: import glext.h version 44
Brian Paul [Fri, 9 Jan 2009 00:19:51 +0000 (17:19 -0700)]
docs: dri2proto, libdrm tweaks
Brian Paul [Fri, 9 Jan 2009 00:07:28 +0000 (17:07 -0700)]
glsl: fix typo in the vec2 += operator function
Brian Paul [Thu, 8 Jan 2009 23:16:36 +0000 (16:16 -0700)]
mesa: set version string to 7.3-rc1
Brian Paul [Thu, 8 Jan 2009 23:15:31 +0000 (16:15 -0700)]
docs: updated Cell docs, from gallium-0.2 branch
Brian Paul [Thu, 8 Jan 2009 23:14:19 +0000 (16:14 -0700)]
docs: more 7.3 doc updates
Brian Paul [Thu, 8 Jan 2009 23:12:23 +0000 (16:12 -0700)]
docs: import 7.2 relnotes, start on 7.3 relnotes
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.
Brian Paul [Wed, 7 Jan 2009 19:31:14 +0000 (12:31 -0700)]
mesa: fix off-by-one bug in _mesa_delete_instructions()
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.
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.
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>
Eric Anholt [Wed, 7 Jan 2009 21:52:51 +0000 (13:52 -0800)]
i965: Remove dead brw_vs_tnl.c
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.
Brian Paul [Thu, 8 Jan 2009 01:44:41 +0000 (18:44 -0700)]
mesa: additional case in file_string()
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.
Brian Paul [Thu, 8 Jan 2009 01:41:54 +0000 (18:41 -0700)]
glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITY
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[]
Brian Paul [Wed, 7 Jan 2009 22:06:06 +0000 (15:06 -0700)]
i965: init dst reg RelAddr field to zero
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.
Eric Anholt [Wed, 7 Jan 2009 20:37:58 +0000 (12:37 -0800)]
i965: Add support for LRP in VPs.
Bug #19226.
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)
Brian Paul [Wed, 7 Jan 2009 15:56:10 +0000 (08:56 -0700)]
glsl: disable some unused functions (but don't remove just yet)
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; ..."
Brian Paul [Wed, 7 Jan 2009 15:32:21 +0000 (08:32 -0700)]
glsl: remove dead code
Brian Paul [Wed, 7 Jan 2009 15:25:59 +0000 (08:25 -0700)]
mesa: OSMesa Makefile fixes (use LIB_DIR)
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...
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).
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)
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)
Brian Paul [Tue, 6 Jan 2009 14:35:45 +0000 (07:35 -0700)]
mesa: remove dri_sarea.h, add glcore.h in Makefile
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.
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)
Xiang, Haihao [Tue, 6 Jan 2009 03:22:19 +0000 (11:22 +0800)]
dri: correct the damage.
Fixes bug #17234
Brian Paul [Tue, 6 Jan 2009 00:52:14 +0000 (17:52 -0700)]
mesa: add GLushort cases for render to texture (Z-buffers)
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.
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.
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.
Brian Paul [Sat, 3 Jan 2009 00:30:08 +0000 (17:30 -0700)]
mesa: fix warning about possibly undefined var in GLSL compiler
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.
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
Brian Paul [Thu, 1 Jan 2009 19:03:07 +0000 (12:03 -0700)]
i965: comments, clean-ups, re-order some functions
Brian Paul [Thu, 1 Jan 2009 00:16:44 +0000 (17:16 -0700)]
i965: added OPCODE_NRM3/4
Brian Paul [Thu, 1 Jan 2009 00:16:27 +0000 (17:16 -0700)]
i965: fix comment
Brian Paul [Thu, 1 Jan 2009 00:01:44 +0000 (17:01 -0700)]
i965: indentation and formatting fixes
Brian Paul [Wed, 31 Dec 2008 23:49:58 +0000 (16:49 -0700)]
i965: implement OPCODE_NRM3/NRM4
Brian Paul [Wed, 31 Dec 2008 23:43:57 +0000 (16:43 -0700)]
i965: whitespace, comment changes
Brian Paul [Wed, 31 Dec 2008 23:38:10 +0000 (16:38 -0700)]
mesa: comments, whitespace changes
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
Brian Paul [Thu, 1 Jan 2009 15:07:54 +0000 (08:07 -0700)]
mesa: updated comments about GLSL constants
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.
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.
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.
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.
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.
Brian Paul [Wed, 31 Dec 2008 00:03:09 +0000 (17:03 -0700)]
mesa: better error message when running out of GLSL samplers
Brian Paul [Wed, 31 Dec 2008 00:00:36 +0000 (17:00 -0700)]
mesa: comments for some state vars
Brian Paul [Wed, 31 Dec 2008 00:00:06 +0000 (17:00 -0700)]
mesa: increase max constants/uniforms to 256 (vec4 vectors)
Brian Paul [Tue, 30 Dec 2008 14:57:16 +0000 (07:57 -0700)]
mesa: updated compilation documentation
Brian Paul [Thu, 18 Dec 2008 23:08:42 +0000 (16:08 -0700)]
demos: minor fixes to twoside.c glsl demo
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.
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.
Alex Deucher [Mon, 29 Dec 2008 17:28:12 +0000 (12:28 -0500)]
R300: missing semicolon
Xiang, Haihao [Mon, 29 Dec 2008 01:30:41 +0000 (09:30 +0800)]
intel: enable ATI_texture_env_combine3. Fixes #17707
Dave Airlie [Sun, 28 Dec 2008 06:48:36 +0000 (16:48 +1000)]
r300: remove the unknowns from the indx_buffer code
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.
Eric Anholt [Tue, 23 Dec 2008 22:45:37 +0000 (14:45 -0800)]
intel: Fix glBitmap clipping for DRI1.
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.
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.
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
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.
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".
Eric Anholt [Fri, 19 Dec 2008 00:00:09 +0000 (16:00 -0800)]
intel: Fix glBitmap top/bottom clipping.
Bug #19139.
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.
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.