OSDN Git Service
Karl Schultz [Thu, 15 Jan 2009 14:05:15 +0000 (07:05 -0700)]
windows: updated mesa.def file
Brian Paul [Thu, 15 Jan 2009 14:04:52 +0000 (07:04 -0700)]
glsl: use _mesa_sprintf()
Brian Paul [Thu, 15 Jan 2009 14:04:36 +0000 (07:04 -0700)]
glsl: move declaration before code
Alan Hourihane [Thu, 15 Jan 2009 11:51:39 +0000 (11:51 +0000)]
mesa: check frambuffer complete status before rendering
Brian Paul [Thu, 15 Jan 2009 00:01:35 +0000 (17:01 -0700)]
mesa: bump version to 7.3-rc2
Brian Paul [Wed, 14 Jan 2009 19:35:43 +0000 (12:35 -0700)]
glsl: fix comment
Brian Paul [Wed, 14 Jan 2009 19:33:06 +0000 (12:33 -0700)]
glsl: minor clean-up for rect sampler test
Brian Paul [Wed, 14 Jan 2009 23:48:54 +0000 (16:48 -0700)]
r300: work-around FRAG_BIT_FOGC warning/error
See bug 17929.
Fog doesn't actually work, but the often complained about warning is
silenced.
Brian Paul [Wed, 14 Jan 2009 23:42:19 +0000 (16:42 -0700)]
i965: asst. fixes, work-arounds for FBOs and render to texture
OpenGL allows mixing and matching depth and stencil renderbuffers in
framebuffer objects while the hardware really only supports interleaved
depth/stencil buffers. This makes for some tricky buffer management.
An extra wrinkle is the situation where the user allocates a 16bpp depth
texture or renderbuffer then tries to render to it along with a stencil
buffer. We'd have to promote the 16bpp Z values to 24-bit Z values and
mix in the stencil values to setup the depth/stencil renderbuffer.
There's no support for that now, so always allocate 32bpp depth textures/
renderbuffers for now.
Brian Paul [Wed, 14 Jan 2009 23:28:55 +0000 (16:28 -0700)]
i965: fix incorrect renderbuffer DataType assignment
Brian Paul [Wed, 14 Jan 2009 23:26:41 +0000 (16:26 -0700)]
i965: fix some FBO depth/stencil assertions
Ian Romanick [Wed, 14 Jan 2009 20:46:06 +0000 (12:46 -0800)]
intel: SW fallback maps texture images, not texture coordinates
Brian Paul [Wed, 14 Jan 2009 19:16:00 +0000 (12:16 -0700)]
glsl: propagate pragma info down into compiler from preprocessor
Brian Paul [Wed, 14 Jan 2009 19:07:25 +0000 (12:07 -0700)]
windows: remove reference to swizzle.c file
Brian Paul [Wed, 14 Jan 2009 18:58:45 +0000 (11:58 -0700)]
glsl: simplify IR storage for samplers
Don't overload the Size field with the texture target, to avoid confusion.
Brian Paul [Wed, 14 Jan 2009 18:50:32 +0000 (11:50 -0700)]
mesa: fix incorrect transformation of GL_SPOT_DIRECTION
This was changed between GL 1.0 and 1.1. Mesa still had the 1.0 behaviour.
Ian Romanick [Wed, 14 Jan 2009 18:05:40 +0000 (10:05 -0800)]
Treat image units and coordinate units differently.
Previously MaxTextureUnits was used to validate both texture image
units and texture coordinate units in fragment programs. Instead, use
MaxTextureCoordUnits for texture coordinate units and
MaxTextureImageUnits for texture image units.
Fixes bugzilla #19468.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Alan Hourihane [Wed, 14 Jan 2009 16:32:44 +0000 (16:32 +0000)]
glsl: fix regression from sampler arrays commit
Brian Paul [Wed, 14 Jan 2009 15:33:45 +0000 (08:33 -0700)]
i965: indentation fixes
Brian Paul [Tue, 13 Jan 2009 17:40:19 +0000 (10:40 -0700)]
i965: allow larger AA points on fallback path
Brian Paul [Tue, 13 Jan 2009 17:38:15 +0000 (10:38 -0700)]
i965: fix indentation
Brian Paul [Tue, 13 Jan 2009 17:26:25 +0000 (10:26 -0700)]
i965: comment for emit_kil()
Brian Paul [Tue, 13 Jan 2009 17:20:15 +0000 (10:20 -0700)]
mesa: put _NV suffix on a few opcodes
Brian Paul [Tue, 13 Jan 2009 17:09:02 +0000 (10:09 -0700)]
i965: fix indentation
Xiang, Haihao [Wed, 14 Jan 2009 01:32:55 +0000 (09:32 +0800)]
intel: bump driver date
Alan Hourihane [Tue, 13 Jan 2009 23:59:18 +0000 (23:59 +0000)]
glsl: fix a comment typo
Alan Hourihane [Tue, 13 Jan 2009 23:54:46 +0000 (23:54 +0000)]
glsl: support sampler arrays.
Brian Paul [Tue, 13 Jan 2009 22:09:13 +0000 (15:09 -0700)]
docs: #pragma now handled
Brian Paul [Tue, 13 Jan 2009 22:06:52 +0000 (15:06 -0700)]
glsl: add preprocessor support for #pragma
Two forms are supported:
Pragmas are silently ignored at this time.
Ian Romanick [Sat, 10 Jan 2009 02:28:38 +0000 (18:28 -0800)]
Add language about implicit flush and command completion
Copied language from the glXSwapBuffers manual page about the implicit
glFlush and expected command completion. This just codifies what
people already expect from glXCopySubBufferMESA. The intention of
this command is to work like glXSwapBuffers but on a sub-rectangle of
the drawable.
Acked-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 13 Jan 2009 16:03:43 +0000 (09:03 -0700)]
docs: fixes since 7.3-rc1
Karl Schultz [Tue, 13 Jan 2009 16:01:34 +0000 (09:01 -0700)]
windows: try to create a context in wglCreateLayerContext()
Brian Paul [Mon, 12 Jan 2009 22:47:36 +0000 (15:47 -0700)]
i965: fix glDrawPixels Z coordinate in intel_texture_drawpixels().
As for glBitmap, it needs to be an NDC coord in [-1,1].
Brian Paul [Mon, 12 Jan 2009 22:43:54 +0000 (15:43 -0700)]
i965: fix broken glBitmap + depth test
When we use the do_blit_bitmap() function, it seems the fragment Z is always
1.0. If depth testing is on, that means that bitmap fragments are often
occluded by other rendering. So, the bitmap doesn't appear even if
rasterpos.Z==0.
The fix is to use the intel_texture_bitmap() path when depth testing is on.
Also, fix the incorrect Z coordinate. It needs to be an NDC value in [-1,1].
Brian Paul [Fri, 9 Jan 2009 22:52:04 +0000 (15:52 -0700)]
i965: fix broken ARB fp fog options
Just call _mesa_append_fog_code() if the fragment program's FogOption is
not GL_NONE.
This allows us to remove some unnecessary i965 fog code.
Note, the arbfplight.c demo can be used to test this (see DO_FRAGMENT_FOG).
Dan Nicholson [Mon, 12 Jan 2009 19:10:31 +0000 (11:10 -0800)]
autoconf: Only _GNU_SOURCE feature test macro needed on gnu systems
According to feature_test_macros(7), _GNU_SOURCE encompasses all the
other feature macros we were setting, so we can just dispose of them.
Julien Cristau [Mon, 12 Jan 2009 15:04:32 +0000 (16:04 +0100)]
mesa: match against *-gnu* instead of *-gnu in configure.ac
Fixes build on arm-linux-gnueabi
Thomas Henn [Mon, 12 Jan 2009 17:56:42 +0000 (10:56 -0700)]
windows: updated VC8 project files
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.