Vinson Lee [Fri, 16 Jul 2010 01:45:20 +0000 (18:45 -0700)]
glsl/apps: Handle ftell errors in non-debug builds.
Brian Paul [Thu, 15 Jul 2010 21:47:03 +0000 (15:47 -0600)]
llvmpipe: implement instanced drawing functions
And express all the other drawing functions in terms of
llvmpipe_draw_range_elements_instanced().
Brian Paul [Thu, 15 Jul 2010 21:41:48 +0000 (15:41 -0600)]
draw: update comments for drawing functions
Brian Paul [Thu, 15 Jul 2010 21:41:15 +0000 (15:41 -0600)]
draw: move prototype, update comment
Brian Paul [Thu, 15 Jul 2010 21:40:52 +0000 (15:40 -0600)]
softpipe: re-order drawing functions to get rid of prototype
Brian Paul [Thu, 15 Jul 2010 21:39:56 +0000 (15:39 -0600)]
graw: new tri-instanced.c program to test instanced drawing
Alex Deucher [Thu, 15 Jul 2010 21:03:58 +0000 (17:03 -0400)]
r600: fix typo in r700 assembler
Noticed by Henri Verbeet on IRC.
NOTE: This is a candidate for the 7.8 branch.
Henri Verbeet [Thu, 15 Jul 2010 18:53:16 +0000 (14:53 -0400)]
radeon: Also flush if it's not the current context that's being destroyed.
This avoids calling radeonFlush() during context destruction, when
ctx->DrawBuffer would be NULL.
NOTE: This is a candidate for the 7.8 branch.
Alex Deucher [Thu, 15 Jul 2010 18:47:06 +0000 (14:47 -0400)]
radeon: allow driconf vblank settings with dri2
fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28771
NOTE: This is a candidate for the 7.8 branch.
Brian Paul [Thu, 15 Jul 2010 16:46:33 +0000 (10:46 -0600)]
st/mesa: fix quad strip trimming bug
The translate_prim() function tries to convert quad strips into
tri strips. This is normally OK but we have to check for an odd
number of vertices so that we don't accidentally draw an extra
triangle. The mesa-demos/src/samples/prim.c demo exercises that.
With this fix the stray yellow triangle is no longer drawn.
Use the u_trim_pipe_prim() function to make sure that prims have
the right number of vertices and avoid calling gallium drawing
functions when the prim has a degenerate number of vertices.
Plus add comments, clean-up formatting, etc.
NOTE: This is a candidate for the 7.8 branch.
José Fonseca [Thu, 15 Jul 2010 09:59:03 +0000 (10:59 +0100)]
llvmpipe: Remove redundant statement.
Thanks to Vinson for spotting this.
Vinson Lee [Thu, 15 Jul 2010 08:42:02 +0000 (01:42 -0700)]
glu/sgi: Remove dead initialization in extract565.
Vinson Lee [Thu, 15 Jul 2010 08:26:09 +0000 (01:26 -0700)]
tgsi: Remove dead assignment in uprcase function.
Vinson Lee [Thu, 15 Jul 2010 07:53:07 +0000 (00:53 -0700)]
mesa: Fix potential out-of-bounds access by _vbo_Materialf.
_vbo_Materialf calls _vbo_Materialfv, which uses the params argument as
an array.
Vinson Lee [Thu, 15 Jul 2010 07:20:41 +0000 (00:20 -0700)]
glx: Move dereference and initialization to after NULL check.
Chia-I Wu [Wed, 14 Jul 2010 16:31:39 +0000 (00:31 +0800)]
egl: Return the correct array size in _eglFlattenArray.
The function is used by _eglGetConfigs and _eglGetScreens. The array
size should not be limited by the buffer size when the buffer is NULL.
This fixes fdo bug #29052.
Brian Paul [Wed, 14 Jul 2010 21:11:32 +0000 (15:11 -0600)]
mesa: fix _mesa_Texture/Render/BufferObjectUnpurgeable() return values
Fixes piglit object_purgeable-api-pbo, object_purgeable-api-vbo
and object_purgeable-api-texture failures with swrast.
NOTE: This is a candidate for the 7.8 branch.
Brian Paul [Wed, 14 Jul 2010 20:50:29 +0000 (14:50 -0600)]
mesa: update assertions and fix refcounting in depth/stencil renderbuffer code
Brian Paul [Wed, 14 Jul 2010 20:36:25 +0000 (14:36 -0600)]
mesa: silence a printf warning
Brian Paul [Wed, 14 Jul 2010 20:35:21 +0000 (14:35 -0600)]
llvmpipe: delete lp_test_*.o files with make clean
Brian Paul [Wed, 14 Jul 2010 20:34:45 +0000 (14:34 -0600)]
gallium: added CLEAN_EXTRA var for make clean target
Nick Bowler [Wed, 14 Jul 2010 16:01:49 +0000 (12:01 -0400)]
dri2: Track event mask in client code.
When direct rendering is being used, DRI2 BufferSwapComplete events are
sent unconditionally to clients, even if they haven't been requested.
This causes error messages to be printed by every freeglut application
of the form
freeglut (./gears): Unknown X event type: 104
and might confuse other clients.
This is a fixed up version of the patch by Jesse Barnes, which drops
BufferSwapComplete events if they are not requested by clients.
Fixes fdo bug 27962.
Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
José Fonseca [Wed, 14 Jul 2010 15:15:56 +0000 (16:15 +0100)]
gallium: Ensure prototypes are wrapped in extern "C".
Fixes MSVC build failure due to inconsistent _ReadWriteBarrier
prototype.
José Fonseca [Wed, 14 Jul 2010 13:53:35 +0000 (14:53 +0100)]
llvmpipe: Remove redundant alignments.
The lp_rast_shader_inputs' alignment is irrelevant now that it contains
pointers instead of actual data.
Likewise, lp_rast_triangle's size alignment is meaningless.
Chris Li [Wed, 14 Jul 2010 13:19:11 +0000 (14:19 +0100)]
llvmpipe: Addi ssse3 swizzling for B8G8R8A8_UNORM.
José Fonseca [Wed, 14 Jul 2010 13:00:20 +0000 (14:00 +0100)]
gallium: Add a macro for memory barriers.
José Fonseca [Wed, 14 Jul 2010 11:23:16 +0000 (12:23 +0100)]
gallium: Add a new PIPE_ARCH_SSSE3 define for SSSE3 compiler support.
Zack Rusin [Wed, 14 Jul 2010 01:54:14 +0000 (21:54 -0400)]
Merge branch 'mesa-2d-registers'
Zack Rusin [Wed, 14 Jul 2010 01:49:53 +0000 (21:49 -0400)]
mesa: add comments and change Index2D to just Index2
Marek Olšák [Tue, 13 Jul 2010 23:59:28 +0000 (01:59 +0200)]
r300/compiler: fix swizzling in the transformation of Abs modifiers
Jakob Bornecrantz [Tue, 13 Jul 2010 18:32:16 +0000 (19:32 +0100)]
i965g: Fix scons build of dri driver
Roland Scheidegger [Tue, 13 Jul 2010 17:59:38 +0000 (19:59 +0200)]
llvmpipe: fix comment typo
Roland Scheidegger [Tue, 13 Jul 2010 17:58:58 +0000 (19:58 +0200)]
llvmpipe: move rasterizer to screen instead of setup context
there's no point of having this per context, so move to screen
(and protect with a mutex).
José Fonseca [Tue, 15 Jun 2010 11:20:01 +0000 (12:20 +0100)]
llvmpipe: Align texture data to the cache line.
Keith Whitwell [Sat, 10 Jul 2010 15:40:34 +0000 (16:40 +0100)]
llvmpipe: eliminate the set_state rasterizer command
Just put a pointer to the state in the tri->inputs struct. Remove
some complex logic for eliminating unused statechanges in bins at the
expense of a slightly larger triangle struct.
Keith Whitwell [Thu, 17 Jun 2010 20:19:09 +0000 (21:19 +0100)]
llvmpipe: pass mask into fragment shader
Move this code back out to C for now, will generate separately.
Shader now takes a mask parameter instead of C0/C1/C2/etc.
Shader does not currently use that parameter and rasterizes whole
pixel stamps always.
Keith Whitwell [Thu, 8 Jul 2010 14:13:35 +0000 (15:13 +0100)]
llvmpipe: move fences from per-bin to per-thread
Rather than inserting an lp_rast_fence command at the end of each
bin, have each rasterizer thread call this function directly once
it has run out of work to do on a particular scene.
This results in fewer calls to the mutex & related functions, but more
importantly makes it easier to recognize empty bins.
José Fonseca [Mon, 12 Jul 2010 15:28:33 +0000 (16:28 +0100)]
llvmpipe: Always swizzle/unswizzle whole tiles.
This was already the case, but the generated (un)swizzling code was not
benefiting of that knowledge.
Jakob Bornecrantz [Tue, 13 Jul 2010 14:46:29 +0000 (07:46 -0700)]
llvmpipe: Ignores!
Jakob Bornecrantz [Tue, 13 Jul 2010 14:44:37 +0000 (07:44 -0700)]
targets: Link xorg drivers with LLVM if built
Jakob Bornecrantz [Tue, 13 Jul 2010 14:44:13 +0000 (07:44 -0700)]
targets: Clean up xorg make files a bit
Jakob Bornecrantz [Tue, 13 Jul 2010 14:40:47 +0000 (07:40 -0700)]
st/xorg: When selecting st via configure make sure to test for xorg-server
Brian Paul [Tue, 13 Jul 2010 13:46:22 +0000 (07:46 -0600)]
libgl-xlib: add depend to make clean list
Brian Paul [Tue, 13 Jul 2010 13:44:35 +0000 (07:44 -0600)]
glapi: use _mesa_snprintf()
Note that the enums.c file is generated with this script.
This will preserve the change from commit
c4066b78c0aad41c199eb27157538c2ec9ab5bfd.
Marek Olšák [Tue, 13 Jul 2010 12:45:38 +0000 (14:45 +0200)]
r300/compiler: implement the Abs source operand modifier for vertex shaders
Marek Olšák [Tue, 13 Jul 2010 04:38:30 +0000 (06:38 +0200)]
r300/compiler: emulate SIN/COS/SCS in r3xx-r4xx vertex shaders
Despite the docs, the corresponding hardware instructions are r5xx-only.
Vinson Lee [Tue, 13 Jul 2010 07:31:37 +0000 (00:31 -0700)]
mesa: s/snprintf/_mesa_snprintf/
Marek Olšák [Tue, 13 Jul 2010 02:29:53 +0000 (04:29 +0200)]
r300g: do not advertise half_float_vertex on rv3x0
rv3x0 can't do it.
Marek Olšák [Mon, 12 Jul 2010 22:47:39 +0000 (00:47 +0200)]
r300g: extend and clean up debug logging
Marek Olšák [Mon, 12 Jul 2010 21:03:34 +0000 (23:03 +0200)]
r300g/swtcl: do not emit texcoords if they are also stuffed in GA
Marek Olšák [Mon, 12 Jul 2010 20:29:28 +0000 (22:29 +0200)]
r300g: rework the draw_rectangle hook
It is a lot simplier, cleaner, and more stable now.
Maciej Cencora [Mon, 12 Jul 2010 21:42:06 +0000 (23:42 +0200)]
Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
Vinson Lee [Mon, 12 Jul 2010 21:21:57 +0000 (14:21 -0700)]
r600: Fix include recursion.
Fix r600_context.h -> r700_oglprog.h -> r600_context.h include
recursion.
Vinson Lee [Mon, 12 Jul 2010 21:12:02 +0000 (14:12 -0700)]
r300g: Remove unnecessary header.
Maciej Cencora [Mon, 12 Jul 2010 19:45:20 +0000 (21:45 +0200)]
radeon: fix some wine d3d9 tests
Need to flush command stream before mapping texture image
that is referenced by current cs.
Candidate for 7.8 branch.
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
José Fonseca [Mon, 12 Jul 2010 14:00:56 +0000 (15:00 +0100)]
llvmpipe: Re-enable threading on windows.
nobled [Sat, 3 Jul 2010 20:49:48 +0000 (13:49 -0700)]
os: remove gratuitous pipe_barrier placeholder code
There's already an implementation of pipe_barrier using
the other pipe_* primitives; just use that on Windows, too.
Now Windows passes pipe_barrier_test.
nobled [Sat, 3 Jul 2010 20:49:31 +0000 (13:49 -0700)]
os, rbug: remove PIPE_THREAD_HAVE_CONDVAR
The new default implementation of pipe_condvar makes it
unnecessary.
nobled [Sat, 3 Jul 2010 20:48:58 +0000 (13:48 -0700)]
os: Implement pipe_condvar on Windows Vista and later
Unfortunately compiling with these defines enabled would mean
Gallium can't run on Windows XP/2003 or older.
Todo: Need a macro to declare if we don't care about WinXP
compatibililty.
nobled [Sat, 3 Jul 2010 20:48:49 +0000 (13:48 -0700)]
os: Implement pipe_condvar on win32
Or at least a little of it. This version will sleep
for a fixed amount of time instead of just deadlocking,
which is a slight improvement.
Also do the same thing on any unrecognized platform.
Marek Olšák [Mon, 12 Jul 2010 11:23:24 +0000 (13:23 +0200)]
r300g: implement fast color clear
An initial implementation made by Dave Airlie.
For it to be used, a color-only clear must be invoked and exactly one
point-sampled render target must be set. The render target must be
macrotiled (for us to overcome alignment issues) and bpp must be either
16 or 32.
I can't see a difference in performance. :(
Conflicts:
src/gallium/drivers/r300/r300_blit.c
Marek Olšák [Mon, 12 Jul 2010 09:41:52 +0000 (11:41 +0200)]
r300g: clear and copy a resource with a rectangular point sprite
With an ordinary quad, the pixels on the main diagonal are computed
and stored twice, which is somewhat inefficient and might not work well
with specialized clear codepaths.
Marek Olšák [Mon, 12 Jul 2010 04:52:06 +0000 (06:52 +0200)]
r300g: do not use immediate mode if there is a VBO in VRAM
And other minor fixups.
Marek Olšák [Mon, 12 Jul 2010 04:32:50 +0000 (06:32 +0200)]
u_blitter: add draw_rectangle callback which can be overridden by a driver
Marek Olšák [Mon, 12 Jul 2010 03:18:05 +0000 (05:18 +0200)]
u_blitter: clean up the texcoord computations
Marek Olšák [Mon, 12 Jul 2010 03:16:19 +0000 (05:16 +0200)]
u_blitter: simplify blitter_set_rectangle
Marek Olšák [Mon, 12 Jul 2010 00:06:19 +0000 (02:06 +0200)]
u_blitter: rename blitter->base, add a way to get a pipe context from blitter
Marek Olšák [Sun, 11 Jul 2010 21:56:22 +0000 (23:56 +0200)]
r300g: ugly fix of a hardlock in the cubestorm xscreensaver
FDO bug #28563.
Maciej Cencora [Sun, 11 Jul 2010 13:39:48 +0000 (15:39 +0200)]
radeon: lower texture memory consumption is some cases
When searching for valid miptree check images in range
of [BaseLeve, MaxLevel] not [MinLod, MaxLoad].
Prevents unnecessary miptree allocations in cases when during
every rendering operation different texture image level
was selected using MIN_LOD = MAX_LOD = level (for every level
new miptree for whole texture was allocated).
Candidate for 7.8 branch.
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
Maciej Cencora [Sun, 11 Jul 2010 13:33:18 +0000 (15:33 +0200)]
radeon: fix teximage migration failure in rare case
Always store selected miptree in texObj->mt so get_base_teximage_offset returns correct data.
Found with piglit/mipmap-setup.
Candidate for 7.8 branch.
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
Maciej Cencora [Sun, 11 Jul 2010 12:04:18 +0000 (14:04 +0200)]
r300c: Fix vertex data setup for named buffer objects with unaligned offset
Candidate for 7.8 branch
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
Vinson Lee [Sun, 11 Jul 2010 07:14:53 +0000 (00:14 -0700)]
r600: Remove unnecessary headers.
Zack Rusin [Sat, 10 Jul 2010 23:21:42 +0000 (19:21 -0400)]
mesa: make uniform work with geometry shaders
Zack Rusin [Sat, 10 Jul 2010 22:24:22 +0000 (18:24 -0400)]
Revert "mesa: temporarily enable printing of Mesa's GPU instructions"
This reverts commit
7b8726a99da961fe0ace7c7ee567f82217715fe4.
Zack Rusin [Sat, 10 Jul 2010 22:14:47 +0000 (18:14 -0400)]
mesa: GL_TRIANGLE_STRIP_ADJACENCY_ARB is the last valid primitive
Zack Rusin [Sat, 10 Jul 2010 22:14:14 +0000 (18:14 -0400)]
tgsi: make sure that we print out the adjacency prims correctly
Zack Rusin [Sat, 10 Jul 2010 22:13:48 +0000 (18:13 -0400)]
draw: fix decomposition to work with adjacency primitives
Marek Olšák [Sat, 10 Jul 2010 18:34:29 +0000 (20:34 +0200)]
r300g: do not print a rejected CS if RADEON_DUMP_CS is not set
Also print relocation failures on non-debug builds too.
Vinson Lee [Sat, 10 Jul 2010 07:15:27 +0000 (00:15 -0700)]
r600: Fix GCC 'implication declaration of function' warnings.
Fix GCC 'implicit declaration of function' compiler warnings resulting
from commit
00fb58ed5d7104e675fe48d84e5049e5f7dbb9d7.
Zack Rusin [Sat, 10 Jul 2010 06:02:35 +0000 (02:02 -0400)]
mesa: get the translation from mesa 2d regs to tgsi working
first working version of arb_geometry_shader4
Zack Rusin [Sat, 10 Jul 2010 02:40:04 +0000 (22:40 -0400)]
mesa: initial support for emitting 2D registers from slang
Vinson Lee [Sat, 10 Jul 2010 01:59:01 +0000 (18:59 -0700)]
r600: Remove unnecessary header.
Fixes r600_emit.h -> r600_cmdbuf.h -> r600_emit.h include recursion.
Zack Rusin [Sat, 10 Jul 2010 01:20:50 +0000 (21:20 -0400)]
mesa: temporarily enable printing of Mesa's GPU instructions
Zack Rusin [Sat, 10 Jul 2010 01:19:28 +0000 (21:19 -0400)]
mesa: add basic support for 2D register arrays to mesa
just like in Gallium it's a basic functionality needed by a lot
of modern graphcis extensions
Vinson Lee [Sat, 10 Jul 2010 01:09:26 +0000 (18:09 -0700)]
r600: Fix include recursion.
r700_chip.h included r600_context.h, which included r700_chip.h.
Remove the unnecessary r600_context.h inclusion and add missing
headers.
Vinson Lee [Sat, 10 Jul 2010 00:34:40 +0000 (17:34 -0700)]
glslcompiler: Fix GCC warn_unused_result warning.
Vinson Lee [Fri, 9 Jul 2010 23:20:32 +0000 (16:20 -0700)]
glslcompiler: Fix memory leaks on error paths.
Vinson Lee [Fri, 9 Jul 2010 23:05:42 +0000 (16:05 -0700)]
glslcompiler: Remove unnecessary headers.
Vinson Lee [Fri, 9 Jul 2010 22:06:19 +0000 (15:06 -0700)]
mesa: Move [UN]CLAMPED_FLOAT_TO_UBYTE from imports.h to macros.h.
The other similar integer/float conversion macros are in macros.h.
Marek Olšák [Fri, 9 Jul 2010 18:22:20 +0000 (20:22 +0200)]
r300g: allow the GTT domain for samplers
This fixes sluggishness in vdrift.
Tom Stellard [Thu, 8 Jul 2010 21:40:48 +0000 (14:40 -0700)]
r300/compiler: Add a register rename pass.
This pass renames register in order to make it easier for the pair
scheduler to group TEX instructions together.
This fixes fdo bug #28606
Tom Stellard [Sun, 4 Jul 2010 19:30:52 +0000 (12:30 -0700)]
r300/compiler: Fix scheduling of TEX instructions.
The following instruction sequence will no longer be emitted in separate
TEX blocks:
0: TEX temp[0].xyz, temp[1].xy__, 2D[0];
1: TEX temp[1].xyz, temp[2].xy__, 2D[0];
This fixes fdo bug #25109
Marek Olšák [Fri, 9 Jul 2010 01:48:43 +0000 (03:48 +0200)]
r300g/swtcl: fix out-of-bounds write
This is a typo fix, the generated code should be the same.
Vinson Lee [Fri, 9 Jul 2010 00:54:47 +0000 (17:54 -0700)]
draw: Fix off-by-one error in assert.
textures is an array of size PIPE_MAX_VERTEX_SAMPLERS.
Brian Paul [Fri, 9 Jul 2010 00:35:08 +0000 (18:35 -0600)]
glsl: fix indirect addressing of gl_TextureMatrix[] arrays
The code to emit an array of OpenGL state vars lacked the code
to handle the gl_TextureMatrix[] array.
Fixes fd.o bug 28967
NOTE: this is a candidate for the 7.8 branch.
Kristian Høgsberg [Thu, 3 Jun 2010 02:48:06 +0000 (22:48 -0400)]
egl_dri2: Support _EGL_PLATFORM_DRM
This lets the egl_dri2 driver initialize on just a DRM fd.
Vinson Lee [Thu, 8 Jul 2010 23:06:01 +0000 (16:06 -0700)]
glslcompiler: Fix build.
Vinson Lee [Thu, 8 Jul 2010 22:58:23 +0000 (15:58 -0700)]
Merge branches 'master' and 'master' of ssh://git.freedesktop.org/git/mesa/mesa
Marek Olšák [Thu, 8 Jul 2010 22:16:49 +0000 (00:16 +0200)]
r300g: fix texturing with negative lod bias
This should fix FDO bugs #28437 and #28625.
Marek Olšák [Thu, 8 Jul 2010 20:32:39 +0000 (22:32 +0200)]
r300g: store/return the stride for winsys_handle in winsys