Commit graph

26564 commits

Author SHA1 Message Date
Alex Deucher
530e3e389d Pull in additional state setup from the DDX 2009-06-09 18:20:57 -04:00
Keith Whitwell
76a1017e97 mesa/st: fix tracking of mapped buffer ranges
In st_bufferobj_map_range(), set obj->Offset consistently with its
usage elsewhere.
2009-06-09 18:32:18 +01:00
Keith Whitwell
9192347443 stw: ignore swapbuffer requests on singlebuffer
Return TRUE in this case.  Returning FALSE seems to result in
mis-rendering -- possibly opengl32.dll is trying to compensate by
doing a software blit??
2009-06-09 16:37:38 +01:00
Brian Paul
cb549775a5 glsl: Expand nested preprocessor macros.
(cherry picked from master, commit ef8caec29a)
2009-06-09 09:14:38 -06:00
Jakob Bornecrantz
ee98ae5a29 Merge branch 'mesa_7_5_branch'
Conflicts:

	Makefile
	src/mesa/main/version.h
	src/mesa/shader/slang/slang_preprocess.c
	src/mesa/state_tracker/st_cb_bufferobjects.c
2009-06-09 07:53:25 +02:00
Michal Krol
d9617deb00 glsl: Fix symbol replacement handling in preprocessor. 2009-06-10 12:15:13 +02:00
Michal Krol
03760a3903 winsys/gdi: Link to ws2_32 library. 2009-06-10 12:01:13 +02:00
Michal Krol
1b334587e9 trace: __func__ --> __FUNCTION__. 2009-06-10 11:56:38 +02:00
Eric Anholt
b30dc2c66a i915: Add an option for testing the effect of early Z in classic mode.
The early Z stuff is supposed to be unsafe without some more work in the
enable/disable path (in particular, how do we want to get it disabled on
the way out to the X Server?), but at the moment is 6% in OA.
2009-06-09 16:12:43 -07:00
Eric Anholt
38eddf04ed intel: Remove an unneeded hunk that slipped in with texture tiling.
intel_miptree_pitch_align does this later on.
2009-06-09 15:21:17 -07:00
Eric Anholt
1362484840 intel: Base tri clearing depth on Y tiling, not IS_I965().
Y tiling is why the 965 check was there, but I wanted to experiment with Y
on pre-965 as well.
2009-06-09 15:21:17 -07:00
Eric Anholt
2d57e96408 intel: Fix intel_region_unmap to do unmap, not map.
Thanks to Shuang He for catching this.
2009-06-09 15:21:16 -07:00
Brian Paul
a03b349153 i965: added intelFlush() call in intel_get_tex_image()
Fixes the render-to-texture test in progs/tests/getteximage.c
2009-06-09 15:07:39 -06:00
Brian Paul
29c79a03a4 tests: check for GL_EXT/ARB_framebuffer_object 2009-06-09 15:06:41 -06:00
Brian Paul
073c20befa tests: also test glGetTexImage with render to texture
Also, adjust texture dims for the original test.
And use GLEW.
2009-06-09 15:05:36 -06:00
Brian Paul
139f2ddde4 tests: quick and dirty glGetTexImage() test program 2009-06-09 14:05:17 -06:00
Brian Paul
b38dbc5179 intel: use GLboolean, not int, for compressed parameter 2009-06-09 14:05:17 -06:00
Brian Paul
89205a8760 intel: make a bunch of glTexImage-related functions static 2009-06-09 14:05:17 -06:00
Brian Paul
4eb9e58bbb intel: whitespace clean-ups 2009-06-09 14:05:17 -06:00
Brian Paul
c55f1a6c99 vbo: more glDrawElements debug code (disabled) 2009-06-09 14:05:17 -06:00
Brian Paul
4a7fd6323a mesa: added a simple bounds checker to glMap/UnmapBuffer() (disabled) 2009-06-09 14:05:17 -06:00
Jakob Bornecrantz
41482a6461 trace/rbug: Add support for draw block rule 2009-06-09 19:24:06 +01:00
Jakob Bornecrantz
f3cf3d2fc2 rbug: Change block protocol around a bit 2009-06-09 19:22:40 +01:00
Jakob Bornecrantz
b71a254f05 trace/rbug: Return textures currently bound to context 2009-06-09 16:00:40 +01:00
Jakob Bornecrantz
f0c21c0294 rbug: Extend context info and block ops 2009-06-09 16:00:39 +01:00
Brian Paul
42e9bde0fa intel: remove extra \n from warning string 2009-06-09 08:53:56 -06:00
Brian Paul
a81097c545 mesa: reorder fields, update comments for gl_buffer_object 2009-06-09 08:52:56 -06:00
Michal Krol
ef8caec29a glsl: Expand nested preprocessor macros. 2009-06-09 12:14:40 +02:00
Dave Airlie
18b3cbcede radeon: fix mipmap_limits crasher.
This gets the correct srclvl image map when uploading images to the new mipmap.
2009-06-09 13:52:58 +10:00
Corbin Simpson
c534604800 r300-gallium: HW TCL glxgears. (Read the rest of the log.)
Um. So, yeah. Two massive WTF moments here. The first one is that, somehow,
I never actually hooked up vertex shader emission, so the only time that the
VAP gets set up is during surface_copy/surface_fill. That's why acidgears
was happening.

The second one is that, somehow, once I actually hooked it up, glxgears just
magically worked. Without any actual, real testing, I somehow accidentally
made the shader compiler work. Go figure.
2009-06-08 20:23:34 -07:00
Corbin Simpson
cb3b91f2d6 r300-gallium: Make UCP and clip work again for SW TCL.
SW TCL: tri-clip works, tri-userclip works
HW TCL: tri-clip fails, tri-userclip works

That is a 200% improvement over the previous situation. Woot.
2009-06-08 20:01:57 -07:00
Corbin Simpson
ffa1972efb r300-gallium: Don't emit UCP planes for SW TCL. 2009-06-08 19:55:33 -07:00
Brian Paul
8d0f72e8f9 st/mesa: enable GL_ARB_map_buffer_range 2009-06-08 17:07:21 -06:00
Brian Paul
e297569d65 docs: new feature: GL_ARB_map_buffer_range 2009-06-08 17:06:13 -06:00
Brian Paul
e75b283b45 mesa: implement GL_ARB_map_buffer_range
Only enabled for software drivers at this point.

Note that the gl_buffer_object::Access enum field has been replaced by
a gl_buffer_object::AccessFlags bitfield.  The new field is a mask of
the GL_MAP_x_BIT flags which is a superset of the old GL_READ_ONLY,
GL_WRITE_ONLY and GL_READ_WRITE modes.  When we query GL_BUFFER_ACCESS_ARB
we translate the bitfield into the conventional enum values.
2009-06-08 17:02:36 -06:00
Brian Paul
75cb3c3b7a mesa: regenerated files for GL_ARB_map_buffer_range 2009-06-08 17:00:12 -06:00
Brian Paul
9c4ab6f4cc glapi: hook in ARB_map_buffer_range.xml 2009-06-08 16:59:53 -06:00
Brian Paul
b6bc5f37a5 glapi: spec/xml file for GL_ARB_map_buffer_range 2009-06-08 16:58:45 -06:00
Brian Paul
34bb024cf2 st/mesa: fix incorrect bufObj Length assignment, remove unneeded assertion 2009-06-08 16:11:17 -06:00
Brian Paul
462a9525c7 mesa: reorder fields, update comments for gl_buffer_object 2009-06-08 15:27:10 -06:00
Jon TURNEY
7eed6ab5b5 Cygwin build fixes
Fix mklib to deal with NOPREFIX and use --enable-auto-image-base for cygwin
Teach configure.ac some basic facts about cygwin

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-06-08 14:30:46 -06:00
Brian Paul
304ba4bba4 glsl: Fix preprocessor define argument parsing for dead sections.
(cherry picked from master, commit 19a54d9f10)
2009-06-08 13:53:33 -06:00
Michal Krol
19a54d9f10 glsl: Fix preprocessor define argument parsing for dead sections. 2009-06-08 20:52:47 +02:00
Jakob Bornecrantz
77c329a277 pipebuffer: Silence out of heap space debug print 2009-06-08 19:54:55 +02:00
Brian Paul
854151ba62 glsl: preprocessor debug code (disabled) 2009-06-08 10:58:04 -06:00
Brian Paul
cc26e27746 docs: document MESA_EXTENSION_OVERRIDE env var 2009-06-08 10:56:51 -06:00
Brian Paul
f9c0ce0e07 softpipe: advertise PIPE_CAP_MAX_TEXTURE_ANISOTROPY as 16.0
Note that this doesn't have any real significance since
PIPE_CAP_ANISOTROPIC_FILTER still returns 0.
2009-06-08 10:55:34 -06:00
Brian Paul
a6f2663616 mesa: new MESA_EXTENSION_OVERRIDE env var
Can be used to enable/disable extensions as reported by
glGetString(GL_EXTENSIONS).

If a name is preceeded by '-' it's disabled.  Otherwise, the named
extension is enabled.

Intended for debug/test purposes.
2009-06-08 10:52:16 -06:00
Brian Paul
b6753adbc7 st/mesa: remove invalid assertion
It's legal for ARB_vertex_program programs to not write to result.position.
The results are undefined in that case.  This assertion was causing us to
abort/exit though.
2009-06-08 10:46:46 -06:00
José Fonseca
e09f78d8dc mesa: Use matching signedness for the counter as upper bound. 2009-06-08 16:56:41 +01:00