Brian Paul
9fd26daec2
mesa: remove the unused _mesa_UpdateTexEnvProgram() function
2009-02-10 16:30:24 -07:00
Brian Paul
537d3ed6f3
mesa: another fix for program/texture state validation
...
This fixes a regression introduced in 46ae1abbac
Break program validation into two steps, do part before texture state
validation and do the rest after:
1. Determine Vertex/Fragment _Enabled state.
2. Update texture state.
3. Determine pointers to current Vertex/Fragment programs (which may involve
generating new "fixed-function" programs).
See comments in the code for more details of the dependencies.
2009-02-10 16:28:25 -07:00
Brian Paul
c936a6083e
intel: minor reformatting, comments
2009-02-10 15:54:23 -07:00
Brian Paul
1ed5fe5cbf
mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be more consistant with other flags
2009-02-10 15:53:35 -07:00
Brian Paul
46ae1abbac
mesa: fix/change state validation order for program/texture state
...
Program state needs to be updated before texture state since the later depends
on the former.
Fixes piglit texgen failure. The second time through the modes (press 't'
three times) we disable the fragment program and return to conventional texture
mode. State validation failed here because update_texture() saw stale fragment
program state.
2009-02-10 15:53:35 -07:00
Brian
028780a809
demos: remove OSMESA stuff from Makefile
2009-02-09 19:40:10 -07:00
Benjamin Close
17fe478085
autogen: Make sure MAKEFLAGS is not set before running autoreconf
...
Without this the "w" flag may be set which causes the version
to be incorrectly to be obtains in configure.ac causing configure
to fail miserably
2009-02-10 11:58:11 +10:30
Brian Paul
aad3f546a0
mesa: avoid setting texObj->_Complete = GL_FALSE when there's no state change
...
Avoid a little bit of unneeded state validation and fixes a bug where the
texture complete flags was set to false, but we didn't signal _NEW_TEXTURE.
Fixes piglit tex1d-2dborder failure.
2009-02-09 14:00:47 -07:00
Brian Paul
37c768b36a
mesa: add no-change testing for a few more texture parameters
2009-02-09 14:00:47 -07:00
Brian Paul
88f3656ea7
swrast: use ASSIGN_4V() macro
2009-02-09 14:00:47 -07:00
Brian Paul
7eb5a2892d
mesa: replace _mesa_unreference_framebuffer() with _mesa_reference_framebuffer()
2009-02-09 14:00:47 -07:00
Brian Paul
d52294439c
mesa: replace _mesa_unreference_framebuffer() with _mesa_reference_framebuffer()
2009-02-09 14:00:47 -07:00
Brian Paul
60b3fe6c19
i965: need to disable current shader, if any, in intel_clear_tris()
...
Fixes bad background in all the progs/glsl/ tests.
2009-02-09 12:12:29 -07:00
Siddhartha Chaudhuri
1a46c8a062
mesa: autoconf fixes for OS X
...
See bug report 17566.
2009-02-09 07:59:32 -07:00
Brian Paul
4900269819
mesa: rework _mesa_reference_framebuffer() to look like _mesa_reference_renderbuffer()
...
_mesa_unreference_framebuffer() is deprecated since _mesa_reference_framebuffer(ptr, NULL)
can be used instead.
2009-02-09 07:55:08 -07:00
Brian Paul
5199774dc6
mesa: minor fixes to incomplete texture debug code
2009-02-07 11:50:24 -07:00
Brian Paul
266fe93a87
mesa: debug code for printing info about textures, writing teximages to disk
2009-02-07 11:49:52 -07:00
Brian Paul
671fed4d01
mesa: code refactoring: move texcombine code into update_tex_combine()
2009-02-07 11:40:20 -07:00
Brian Paul
2a50dde0f5
mesa: minor clean-ups, remove unneeded conditional
2009-02-07 11:21:44 -07:00
Brian Paul
b46611633c
mesa: fix logic error in computing enableBits in update_texture_state()
...
If we had a vertex shader but no fragment shader (i.e. fixed function) we
didn't get the right enabled texture targets.
Fixes blank/white texture problem.
2009-02-07 11:20:08 -07:00
Brian Paul
f6d23943cd
mesa: fix tnl->render_inputs_bitset setup for fragment program texcoords
...
Handle the case where there's no per-vertex texcoords but the fragment shader
needs texcoords.
Fixes piglit shaders/fp-generic/dph test.
2009-02-06 10:48:38 -07:00
Brian Paul
1df62651b2
swrast: return (0,0,0,1) when sampling incomplete textures, not (0,0,0,0)
...
Fixes piglit shaders/fp-incomplete-tex test.
2009-02-06 10:47:31 -07:00
Brian Paul
e01a03d222
glsl: new MESA_GLSL env var for GLSL debugging features
...
Replaces the VERBOSE_GLSL, VERBOSE_GLSL_DUMP flags which only worked in debug
builds. MESA_GLSL will work both in debug and non-debug builds.
Also add facility to dump glUniform() calls to stdout.
2009-02-06 10:21:36 -07:00
Brian Paul
6ce0c6e743
mesa: tweak output of _mesa_write_shader_to_file()
...
Enclose GPU code in comments to the file can be re-fed back into GLSL compiler.
2009-02-06 10:20:33 -07:00
Brian Paul
aafcc26642
Revert "mesa: meaningless whitespace change to see if git's working (ignore)"
...
This reverts commit b2e779988e .
I didn't mean to push this stuff yet. I'm having a bad git day...
2009-02-06 10:00:34 -07:00
Brian Paul
b2e779988e
mesa: meaningless whitespace change to see if git's working (ignore)
2009-02-06 09:57:28 -07:00
Dave Airlie
da795ff0a8
radeon: remove include that breaks build in !OLD_PACKET path
...
this path isn't enabled by default in any case.
2009-02-07 00:18:34 +10:00
Brian Paul
6e5d311719
mesa: remove oddball linux-directfb-install makefile rule
...
It's probably not needed since the 'make install' rules were overhauled last year.
2009-02-05 08:41:27 -07:00
Brian Paul
681a13e7f9
mesa: minor Makefile improvement for versioning
2009-02-05 08:39:10 -07:00
Brian Paul
285b500bb7
glsl: use _slang_var_swizzle() in a few places to simplify the code.
2009-02-04 17:40:51 -07:00
Brian Paul
d96d8b21bf
glsl: remove unused prototype
2009-02-04 17:37:20 -07:00
Brian Paul
0744805d58
glsl: replace assertion with conditional in _slang_pop_var_table()
...
We were hitting the assertion when we ran out of registers, which can happen.
Also, add some additional assertions and freshen up some comments.
2009-02-04 17:32:07 -07:00
Brian Paul
1ca05a066b
mesa: more info in error messages
2009-02-04 16:33:25 -07:00
Brian Paul
8962bac0a1
swrast: add minor comments
2009-02-04 16:33:25 -07:00
Brian Paul
79e3441f66
Revert "docs: document new MESA_GLX_FORCE_DIRECT env var for the Xlib driver"
...
This reverts commit 2f51be75c5 .
2009-02-04 16:33:25 -07:00
Brian Paul
c35a5aeb70
mesa: make Xlib glXIsDirect() always return True
2009-02-04 16:33:25 -07:00
Brian Paul
c06c74c0b8
demos: remove unused function
2009-02-04 16:33:25 -07:00
Brian Paul
906c60d0b7
demos: silence uninitialized var warning
2009-02-04 16:33:25 -07:00
Brian Paul
803504e69f
mesa: minor error msg improvement
2009-02-04 16:33:25 -07:00
Chris Wilson
e92d97d75b
intel: Decode MI operands using specific length masks
...
The MI opcodes have different variable length masks, so use an operand
specific mask to decode the length.
2009-02-04 17:04:31 -05:00
Chris Wilson
05d130a35a
intel: Correct decoding of 3DSTATE_PIXEL_SHADER_CONSTANTS
...
A couple of minor typos that proclaimed an error in the wrong command, and
failed to offset the mask.
2009-02-04 16:56:31 -05:00
Eric Anholt
b2e09910f6
intel: Fix fbo_firecube regression with FBconfigs change.
...
By selecting a 4444 texture format due to a bad test, we hit the
intel_update_wrapper error path, and despite the appearance of error handling
in it and its callers, the desired behavior (software fallback) doesn't occur.
2009-02-04 10:31:04 -08:00
Maciej Cencora
c20df0ab4e
r300: make the macros safe. add missing parenthesis.
2009-02-04 08:01:52 -07:00
Maciej Cencora
5ee71bad7b
r300: Fix EXP2 fog
2009-02-04 08:01:52 -07:00
Eric Anholt
8910da5b7a
intel: Fix commented-out glViewport in intel_meta_set_passthrough_transform.
...
Too much commit -a while debugging.
2009-02-03 20:06:48 -08:00
Eric Anholt
529d1d720e
swrast: Add support for x8r8g8b8 fbconfig.
...
This lets swrast produce an fbconfig suitable for the root visual now that
the server's not allowing mismatched fbconfigs.
2009-02-03 20:06:48 -08:00
Brian Paul
2f51be75c5
docs: document new MESA_GLX_FORCE_DIRECT env var for the Xlib driver
2009-02-03 15:36:38 -07:00
Brian Paul
49e80bf6b1
xlib: use MESA_GLX_FORCE_DIRECT to make glXIsDirect() always return True
...
Some apps won't run w/ indirect rendering contexts.
Also, consolidate some context-init code in new init_glx_context() function.
2009-02-03 15:36:38 -07:00
Brian Paul
b5d549e351
mesa: simplify delete_wrapper()
2009-02-03 15:36:38 -07:00
Brian Paul
dd22f6f795
demos: modify bufferobj.c to exercise interleaved vertex arrays
...
Also, put colors before vertex positions, and place the data at a 40-byte
offset from the start of the buffer.
2009-02-03 15:17:26 -07:00