Michal Krol
2a661c383f
Merge commit 'origin/master' into glsl-pp-rework-2
...
Conflicts:
src/gallium/winsys/gdi/SConscript
2009-09-17 12:44:24 +02:00
Michal Krol
90daefd1c4
glsl/pp: Add a TODO for FEATURE_es2_glsl.
2009-09-17 12:33:26 +02:00
Michal Krol
4fcda5000e
slang/pp: Fix file number parsing.
2009-09-17 12:14:12 +02:00
Michal Krol
ce8f486156
slang/pp: Use a dictionary for the remaining string literals.
2009-09-17 12:12:34 +02:00
Michal Krol
0ddf41d34d
glsl/pp: Add remaining error messages.
2009-09-17 11:51:35 +02:00
Michal Krol
69bdd47dba
glsl/apps: Always write out error condition.
2009-09-17 10:45:16 +02:00
Brian Paul
21caa29fbd
mesa: begin some texstore code refactoring
...
Next step will be to move the calls to ctx->Driver.ChooseTextureFormat()
into the teximage.c functions so drivers don't have to do it.
2009-09-16 21:50:04 -06:00
Brian Paul
1d8fbef4f2
mesa: meta driver functions for glCopyTex[Sub]Image()
...
Implement in terms of glReadPixels + glTex[Sub]Image().
This will allow us to get rid of some swrast texture code.
2009-09-16 20:09:07 -06:00
Brian Paul
9abbedad09
progs/perf: initial set of simple performance test programs
...
Initial tests include:
drawoverhead - measure overhead of state changes w.r.t drawing commands
teximage - measure glTexImage2D() and glTexSubImage2D() speed
vbo - measure glBufferData() and glBufferSubData() speed
vertexrate - measure vertex rate for immediate mode, glDrawArrays, VBOs, etc.
2009-09-16 19:33:01 -06:00
Brian Paul
4df2f7af5e
progs/glsl: minor Makefile clean-ups
2009-09-16 19:28:55 -06:00
Brian Paul
8d47b4906b
swrast: remove mipmap generation checks (done in core Mesa now)
2009-09-16 19:28:55 -06:00
Brian Paul
4e84b96d92
s3v: remove unneeded initializations
2009-09-16 19:28:54 -06:00
Brian Paul
1b1125c239
ffb: remove disabled code
2009-09-16 19:28:54 -06:00
Michal Krol
cc629940d4
glsl/apps: Always write out error condition.
2009-09-16 22:04:22 +02:00
Michal Krol
a7382628f2
glsl/pp: Validate numbers.
2009-09-16 21:51:12 +02:00
José Fonseca
f911d196cf
llvmpipe: Don't assert due to unsupported texture wrap modes.
...
Issue a warning and fallback to clamping.
2009-09-16 20:42:09 +01:00
Michal Krol
de0753e4cb
glsl/pp: Add more error messages.
2009-09-16 20:40:02 +02:00
Michal Krol
c9de313f1b
slang: Propagate error messages from preprocessor.
2009-09-16 20:28:20 +02:00
Michal Krol
d4638f5dce
glsl/pp: Add more error messages.
2009-09-16 20:27:59 +02:00
Michal Krol
eeb5202e5d
slang: Invoke the preprocessor from withing the slang compiler.
...
This allows us to validate the shader version number.
2009-09-16 19:24:50 +02:00
Ian Romanick
5ce72c559c
Merge branch 'mesa_7_6_branch'
2009-09-16 08:05:36 -07:00
Brian Paul
aabcc6cb23
gallium: remove incorrect 'return' stmt
2009-09-16 08:59:32 -06:00
Ian Romanick
88e3a57605
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
...
Conflicts:
src/mesa/main/dlist.c
2009-09-16 07:57:19 -07:00
Ian Romanick
2921a2555d
intel: Deassociated drawables from private context struct in intelUnbindContext
...
The generic DRI infrastructure makes sure that __DRIcontextRec::driDrawablePriv
and __DRIcontextRec::driReadablePriv are set to NULL after unbinding a
context. However, the intel_context structure keeps cached copies of
these pointers. If these cached pointers are not NULLed and the
drawable is actually destroyed after unbinding the context (typically
by way of glXDestroyWindow), freed memory will be dereferenced in
intelDestroyContext.
This should fix bug #23418 .
2009-09-16 07:39:58 -07:00
José Fonseca
c29905aa31
gallium: Deprecate PIPE_CAP_S3TC.
...
No longer used. S3TC support is queried via
pipe_screen::is_format_supported.
2009-09-16 14:33:52 +01:00
Michal Krol
ec48396e0f
softpipe: Do not advertise Z32_UNORM as a supported format.
2009-09-16 13:56:58 +01:00
José Fonseca
b60e1d7630
gdi: Integrate with llvmpipe where available.
2009-09-16 11:35:23 +01:00
José Fonseca
459ea0095c
llvmpipe: Make the code portable for MinGW.
2009-09-16 11:35:23 +01:00
Zou Nan hai
76e836a41a
i965: do a flush in clear, fix openarena render issue,
...
fd.o bug# 23857
2009-09-16 13:25:46 +08:00
Dave Airlie
858a2a2ac7
radeon: cleanup compile defines mess.
...
I inherited this and really it stayed around far too long,
make it nice and simple.
2009-09-16 13:48:45 +10:00
Dave Airlie
a6a21eb00d
radeon: oops remove debugging left on in previous patch
2009-09-16 13:25:02 +10:00
Dave Airlie
2fdb0e5d3b
radeon: use txformat to decide to emit rect tex state.
...
This is more logical, and fixes a TFP issue.
2009-09-16 13:13:43 +10:00
Brian Paul
2914f2b7fd
mesa: move generate mipmap calls
...
Per the suggestion in the Intel driver, move the calls to
ctx->Driver.GenerateMipmap() into core Mesa so that drivers don't
have to worry about it.
2009-09-15 18:17:43 -06:00
Brian Paul
ef6ee07fc7
mesa: minor clean-up
2009-09-15 18:17:43 -06:00
Brian Paul
a31ac84d74
mesa: remove last of gotos
2009-09-15 18:17:43 -06:00
Brian Paul
c352566933
mesa: more goto removal
2009-09-15 18:17:43 -06:00
Brian Paul
ecf6f37fc2
mesa: remove some gotos
...
This will make some subsequent changes easier...
2009-09-15 18:17:42 -06:00
Brian Paul
c26c2006df
mesa: clean-up fbo debug code
2009-09-15 18:17:42 -06:00
Brian Paul
0b0fc4072f
progs/demos: use non-default texobj in cubemap.c
2009-09-15 18:17:42 -06:00
Brian Paul
7f86da6c60
progs/demos: create a texture object in lodbias.c
...
Before, we were using the default texture object (name=0). This caused
the intel_generate_mipmap() path to fail since passing texture=0 to
glFramebufferTexture2DEXT() causes us to _unbind_ the texture if present.
2009-09-15 18:17:42 -06:00
Zack Rusin
a016043386
st/xorg: fixing copies and composite shaders
...
copies were busted when src == dst. also the composite shaders
were incorrectly using the fragments instead of the texture coordinate.
2009-09-15 19:50:36 -04:00
Zack Rusin
8adcad0c70
st/xorg: lots of fixes
...
fixes blending binding and copy coordinates
2009-09-15 19:50:34 -04:00
Brian Paul
f9574e05c2
docs: GL_ARB_provoking_vertex
2009-09-15 16:01:51 -06:00
Brian Paul
2e7a1dd8ca
mesa: added GL_ARB_provoking_vertex (same as EXT version)
2009-09-15 16:01:51 -06:00
Alex Deucher
87d40a95bf
radeon: don't build non-r600 span code on r600
2009-09-15 17:13:08 -04:00
Alex Deucher
49fc41eeed
r600: minor span cleanups
2009-09-15 17:13:08 -04:00
Brian Paul
d9ddbc3f47
docs: glUniform functions are now compiled into display lists
2009-09-15 15:12:29 -06:00
Brian Paul
41fff1b9a1
mesa: compile glUniformMatrix() functions into display lists
...
I believe this is the last of the shader-related functions that needed
display list treatment.
2009-09-15 15:10:29 -06:00
Brian Paul
6681981fe1
mesa: implement more glUniform display list functions
2009-09-15 14:56:55 -06:00
Brian Paul
3ad108b77f
docs: document glUseProgram display list fix
2009-09-15 14:38:52 -06:00