fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 12:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
26784 commits 66 branches 918 tags 1,003 MiB
Commit graph

26784 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicolai Hähnle
7ca7220ea1 Merge branch 'master' into r300g-glsl 
Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
 2009-10-07 20:45:08 +02:00
Nicolai Hähnle
5b4c0b864a Merge branch 'mesa_7_6_branch' 2009-10-07 20:39:22 +02:00
Nicolai Hähnle
9fde81bb20 shader_api: Fix bounds checking of glUniform and glUniformMatrix 
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
 2009-10-07 20:36:23 +02:00
Nicolai Hähnle
ae351599f1 prog_parameter: Document the fact that Size may be > 4 
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
 2009-10-07 20:33:55 +02:00
Keith Whitwell
3f5a316f36 util: do some more util_blit_pixels cases without temporaries 
When the source surface is pointing at a 2d texture with only one
mipmap level, use that directly rather than creating a temporary.
Probably want to cover more cases, but this is a start.
 2009-10-07 18:15:21 +01:00
Keith Whitwell
c0de2ed505 mesa/st: add missing mesa constant file name 
There are many different names for constants in mesa, we were missing
one since the ureg rewrite.
 2009-10-07 18:15:20 +01:00
Brian Paul
2ef1aae163 st/mesa: pass pipe_screen, not pipe_context to st_choose_format() functions 
These don't depend on context state, but use a screen pointer.
 2009-10-07 09:58:34 -06:00
Brian Paul
cdcd9da480 docs: fix glXQueryDrawable() bugs 2009-10-07 09:41:38 -06:00
Brian Paul
c3eef6021a mesa/xlib: fix glXQueryDrawable() bugs, see bug 24320 2009-10-07 09:41:38 -06:00
Brian Paul
0526100a5c gallium/xlib: fix glXQueryDrawable() bugs, see bug 24320 2009-10-07 09:41:38 -06:00
Brian Paul
f36425b569 progs/xdemos: test glXQueryDrawable() 2009-10-07 09:41:38 -06:00
Brian Paul
846a6b0695 progs/xdemos: fix swapped parameters to CreatePbuffer() 2009-10-07 09:41:38 -06:00
Michel Dänzer
de81b2cf0a st/dri: Add missing front buffer case in dri_get_buffers(). 
This seems to help for compiz at least with some drivers.

Also add an assert(0) to catch unhandled cases in the future.
 2009-10-07 16:36:39 +02:00
Brian Paul
edbaa717b4 swrast: s/GLfloat/GLuint/ in bzero() 2009-10-07 08:07:53 -06:00
Brian Paul
14f21c7850 swrast: add missing returns 2009-10-07 08:05:28 -06:00
Vinson Lee
4b3cbecb3a progs/test: Fix MSVC build. 2009-10-07 07:54:31 -06:00
Brian Paul
e3fff3daf0 mesa/xlib: return 0 for errorBase, eventBase in glXQueryExtension() 
A little better than leaving the values undefined, I think.
See bug 24321.
 2009-10-07 07:45:59 -06:00
Brian Paul
f9904edf53 gallium/xlib: return 0 for errorBase, eventBase in glXQueryExtension() 
A little better than leaving the values undefined, I think.
See bug 24321.
 2009-10-07 07:45:59 -06:00
Jakob Bornecrantz
0f0127f6f9 i915g: Use buffer write instead of map for lit vertices 2009-10-07 14:04:48 +01:00
Jakob Bornecrantz
f8ba93aefd i915g: Change order of buffer_write arguments 
They now follow the pipe_buffer_write style,
	its the gallium driver that sets the interface not
	the winsys.
 2009-10-07 13:48:32 +01:00
Jakob Bornecrantz
030723fc5d i915g: Disable vbuf fifo and minor commenting of vbuf code 
The vbuf fifo doesn't appear to help once the libdrm
	reuse flag has been set.
 2009-10-07 13:48:32 +01:00
Younes Manton
aec2c010f6 nv04-nv40: Fix swizzle transfers for NPOT sizes. 
Workarounds not necessary, SIFM can handle NPOT, we just weren't setting
dst dimensions properly. SIFM can't handle odd w,h though, that still
needs fixing.
 2009-10-06 22:11:07 -04:00
Vinson Lee
9c778a90ea progs/tests: fix MSVC build. 2009-10-06 16:02:47 -06:00
Nicolai Hähnle
57abb76e10 r300/compiler: Fix R300 vertex program dumps 
The source register field has 8 bits.

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
 2009-10-06 21:24:44 +02:00
Nicolai Hähnle
bcfba138cc r300/compiler: Fix yet another regression in register allocation 
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
 2009-10-06 21:13:27 +02:00
Nicolai Hähnle
a09bd685da r300/compiler: Fix a really stupid logic inversion in the generic dataflow code 
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
 2009-10-06 20:25:07 +02:00
Nicolai Hähnle
9e42f0ebc7 r300/compiler: Fix regression in pair scheduling 
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
 2009-10-06 20:08:32 +02:00
Vinson Lee
017fae04ec progs/perf: Fix MSVC build. 2009-10-06 09:13:14 -06:00
Andre Maasikas
ec58dac86d r600: r700PredictRenderSize can flush, so move index buffer setup after it 2009-10-06 16:17:03 +03:00
Ben Skeggs
340436d8d2 nv50: fix segfault when there's gaps in enabled texture units 
Tested with progs/demos/multiarb.
 2009-10-06 13:57:51 +10:00
Ben Skeggs
4911443d36 nouveau: fix buffer object leak 
Very apparent with resizing windows on DRI2.
 2009-10-06 13:31:43 +10:00
Jakob Bornecrantz
db8b363eb9 i915g: Add more defines to tweek batchbuffer 2009-10-06 03:09:16 +01:00
Jakob Bornecrantz
ce3c2b51a2 i915g: Tweek vertexbuffer size 2009-10-06 03:09:01 +01:00
Brian Paul
722ae91722 i965g: remove 965/brw files from XLIB_WINSYS_SOURCES 2009-10-05 14:43:38 -06:00
Brian Paul
55770d09c1 Merge branch 'mesa_7_6_branch' 
Conflicts:

	src/gallium/auxiliary/util/u_cpu_detect.c
 2009-10-05 14:42:08 -06:00
Brian Paul
79892e7976 intel: use driReadDrawable in do_copy_texsubimage() 2009-10-05 14:26:16 -06:00
Brian Paul
3b7ec94c0d intel: use driReadDrawable, not driDrawable in do_blit_readpixels() 2009-10-05 14:25:36 -06:00
Brian Paul
3b29dcbb5e intel: remove a buffer equality test in _mesa_make_current() 
Before, if we called glXMakeCurrent() to change a context's window binding
while an FBO was bound, we weren't updating the intel->driDrawable and
intel->driReadDrawable fields.  This could cause us to dereference a null
pointer elsewhere.
 2009-10-05 14:07:29 -06:00
Jakob Bornecrantz
f00da2a3ff i915g: Drop the simple sufix 
None of the other driver have a silly sufix,
	so just drop it. Nothing new added in this commit
	or any other commit but this is better marketing.
 2009-10-05 19:48:08 +01:00
Jakob Bornecrantz
c4b821a4c6 i965g: Drop i965simple 
The driver never work with real hardware and has
bitrotted for quite some time now, might as well
drop it. If somebody wants to look at it just use git.
 2009-10-05 19:48:03 +01:00
Joakim Sindholt
1f39d59a29 r300g: fix scons build 
So I didn't touch r300compiler, but r300g now compiles after having
declarations and code untangled. As nha so gently points out, we shouldn't
have to do this just to comply with MSVC compilers.
 2009-10-05 19:25:04 +02:00
Brian Paul
a8768bbc9d mesa: fix return value when clipping {Read,Draw}Pixels height <= 0 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

(cherry picked from master, commit 7aeaca33c3)
 2009-10-05 11:10:31 -06:00
Jon TURNEY
a15d9ca9cc Fix building of GLSL demos which use M_PI 
Some <math.h> files do not define M_PI, in which case, provide our own definition

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
 2009-10-05 11:07:23 -06:00
José Fonseca
6971be783b util: Improve the cpuid assembly. 
No need to save ebx on 64bit. Use just xchgl. Refer to gcc's cpuid.h header.

Thanks to Uros Bizjak for pointing this out.
 2009-10-05 16:49:21 +01:00
José Fonseca
75e0a376cd mesa: Copy textures' base format into wrapper renderbuffer. 
Otherwise st_copy_texsubimage will fallback to software blit due to
inconsistent base formats.
 2009-10-05 16:49:21 +01:00
Keith Whitwell
b02ef740b9 mesa/st: add ST_DEBUG environment variable 
At last it's possible to turn on tgsi dumps and other debugging in the
state tracker without modifying sources...
 2009-10-05 15:51:55 +01:00
Keith Whitwell
6a085184eb util: add lost code to util_make_fragment_tex_shader_writemask() 
This got ported to ureg at some point, but lost the code that
distinguishes it from regular util_make_fragment_tex_shader().
 2009-10-05 15:51:55 +01:00
Andre Maasikas
0b032eabc7 r600: update vertex program selection for draw path 2009-10-05 13:38:53 +03:00
Michel Dänzer
43750f1575 Use _mesa_select_tex_image() rather than hardcoding face 0. 
Fixes crash loading a map in sauerbraten with

hwmipmap 1

in ~/.sauerbraten/config.cfg.
 2009-10-05 12:31:51 +02:00
Ben Skeggs
d47de50540 st/dri: avoid segfault if we can't get a pixmap's buffers 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 2009-10-05 15:52:33 +10:00