Kristian Høgsberg [Fri, 23 Jul 2010 01:24:14 +0000 (21:24 -0400)]
glx: Allocate the __GLXcontext in the DRI drivers
Kristian Høgsberg [Fri, 23 Jul 2010 01:11:02 +0000 (21:11 -0400)]
glx: Use _Xglobal_lock for protecting extension display list
Avoids double locking glXLock in the X wire to event handlers.
Brian Paul [Thu, 22 Jul 2010 22:35:43 +0000 (16:35 -0600)]
glsl: remove invalid _mesa_problem() call
Fixes fd.o bug 29206.
Brian Paul [Thu, 22 Jul 2010 22:07:18 +0000 (16:07 -0600)]
draw: re-order optimization passes depending on LLVM version, 32/64-bit
This is a work-around for an apparent bug in LLVM seen with piglit's
glsl-vs-sqrt-zero test.
Brian Paul [Thu, 22 Jul 2010 17:18:45 +0000 (11:18 -0600)]
draw: added new assertions to clipping code
Eric Anholt [Thu, 22 Jul 2010 17:04:24 +0000 (10:04 -0700)]
i965: Respect VS/VP point size result when enabled.
Fixes glsl-vs-point-size.
Eric Anholt [Thu, 22 Jul 2010 08:53:43 +0000 (01:53 -0700)]
i965: Fix the disasm output for da16 src widths.
This has confused me twice now. It's a fixed width of 4 (usually a
region description of <4,4,1>), not 1. If it was 1, we'd have been
skipping all over register space.
Eric Anholt [Thu, 22 Jul 2010 08:27:15 +0000 (01:27 -0700)]
i965: Avoid extra MOV in VS indirect register reads.
Eric Anholt [Thu, 22 Jul 2010 07:06:10 +0000 (00:06 -0700)]
i965: Fix up VS temporary array access for fixed index offset != 0.
Henri Verbeet [Thu, 22 Jul 2010 15:10:11 +0000 (11:10 -0400)]
r600: Flip point sprite coordinates when rendering to an FBO.
This supersedes http://lists.freedesktop.org/archives/mesa-dev/2010-July/001442.html.
Eric Anholt [Thu, 22 Jul 2010 04:45:34 +0000 (21:45 -0700)]
i965: In the VS, multiply the address reg by the appropriate register size.
The ARL value is increments of vec4 in the register file. But
PROGRAM_TEMPORARY or PROGRAM_INPUT are stored as vec4s interleaved
between the two verts being executed (thus a vec8 each), compared to
PROGRAM_STATE_VAR being packed vec4s.
Fixes:
glsl-vs-arrays-2
glsl-vs-mov-after-deref
(without regressing glsl-vs-arrays-3)
Eric Anholt [Thu, 22 Jul 2010 02:49:39 +0000 (19:49 -0700)]
i965: Clean up brw_dp_READ_4_vs() now that it has fewer options to support.
Eric Anholt [Thu, 22 Jul 2010 01:29:06 +0000 (18:29 -0700)]
i965: Support relative addressed VS constant reads using the appropriate msg.
The previous support was overly complicated by trying to use the same
1-OWORD message for both offsets.
Eric Anholt [Thu, 22 Jul 2010 01:41:06 +0000 (18:41 -0700)]
i965: Fix the DP read msg_control definitions other than plain OWORD.
Eric Anholt [Thu, 22 Jul 2010 00:35:21 +0000 (17:35 -0700)]
i965: Clean up dead code from the VS get_constant/get_reladdr_constant split.
Eric Anholt [Wed, 21 Jul 2010 22:54:53 +0000 (15:54 -0700)]
i956: Set the execution size correctly for scratch space writes.
Otherwise, the second half isn't written, and we end up reading back
black.
Fixes the remaining junk drawn in glsl-max-varyings, and will likely
help with a number of large real-world shaders.
Eric Anholt [Wed, 21 Jul 2010 20:52:37 +0000 (13:52 -0700)]
i965: Set the GEM domain flags for the scratch space.
They go into the render cache, so while we don't care about their
contents after execution, failing to note them could cause the writes
to be flushed over important buffer contents later.
Eric Anholt [Wed, 21 Jul 2010 20:49:14 +0000 (13:49 -0700)]
i965: Use the pretty define for 4-oword DP reads.
Eric Anholt [Wed, 21 Jul 2010 20:07:12 +0000 (13:07 -0700)]
i965: Set the send commit bit on register spills as required pre-gen6.
Otherwise, the subsequent read may not get the written value.
Eric Anholt [Wed, 21 Jul 2010 18:19:52 +0000 (11:19 -0700)]
i965: Add disasm for dataport reads (register unspilling).
Kristian Høgsberg [Wed, 21 Jul 2010 18:09:49 +0000 (14:09 -0400)]
glx: Move last few dri_interface.h types out of glxclient.h and drop include
Kristian Høgsberg [Wed, 21 Jul 2010 17:55:30 +0000 (13:55 -0400)]
glx: Move __driContext field out of __GLXcontextRec
Brian Paul [Wed, 21 Jul 2010 22:48:45 +0000 (16:48 -0600)]
softpipe: add missing support for PIPE_FORMAT_S8_USCALED surfaces
And remove checks of surface depth bits. The state tracker should
not turn on depth/stencil testing if the framebuffer doesn't have
depth/stencil.
Brian Paul [Wed, 21 Jul 2010 22:00:42 +0000 (16:00 -0600)]
softpipe: fix sp_tile_cache_flush_clear() regression
Jerome Glisse [Wed, 21 Jul 2010 21:40:37 +0000 (17:40 -0400)]
Revert "dri2: Remove an unused variable."
glx_info is used if X_DRI2SwapBuffers is defined
This reverts commit
c0ca2bfb2ad8cf7fb9d756b5ae52cb77236ff605.
Jerome Glisse [Wed, 21 Jul 2010 21:03:38 +0000 (17:03 -0400)]
r600g: add support for all R6XX/R7XX asic
This configure some of the value properly based on
asic so others asic than RV710 works too.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Dave Airlie [Wed, 21 Jul 2010 05:39:23 +0000 (15:39 +1000)]
r600g: add r600 compile mode to compiler.
some of the ALU instructions are different on r6xx vs r7xx,
separate the alu translation to separate files, and use family
to pick which compile stage to use.
Dave Airlie [Wed, 21 Jul 2010 05:39:01 +0000 (15:39 +1000)]
r600g: add family retrival
allow pipe driver to get the family of the gpu.
Marek Olšák [Wed, 21 Jul 2010 20:31:59 +0000 (22:31 +0200)]
llvmpipe: say no to depth clamp
The other drivers just return 0 without the assert.
Marek Olšák [Tue, 20 Jul 2010 14:37:22 +0000 (16:37 +0200)]
r300g: implement depth clamp
Depth clamping seems to be implicit if clipping is disabled.
It's not perfect, but it's good enough for wine and passes
the corresponding piglit tests.
Marek Olšák [Wed, 21 Jul 2010 18:41:04 +0000 (20:41 +0200)]
r300g: cleanup clip state emission
Marek Olšák [Wed, 21 Jul 2010 18:31:39 +0000 (20:31 +0200)]
draw: disable depth clipping if depth clamp is enabled
Marek Olšák [Wed, 21 Jul 2010 07:14:43 +0000 (09:14 +0200)]
st/mesa: implement depth clamp
Marek Olšák [Wed, 21 Jul 2010 07:14:21 +0000 (09:14 +0200)]
cso: handle depth clamp
Marek Olšák [Wed, 21 Jul 2010 07:13:53 +0000 (09:13 +0200)]
gallium: add depth clamp to the interface
Carl Worth [Wed, 21 Jul 2010 20:26:26 +0000 (13:26 -0700)]
Add missing initialization of inOutFlags pointer.
This quiets a compiler warning, (and ensures a segmentation fault rather
than memory corruption if this variable is written through before being
initialized elsewhere).
Carl Worth [Tue, 20 Jul 2010 22:59:56 +0000 (15:59 -0700)]
Makefiles: Don't complain if depend file to be included doesn't exist.
While bootstrapping the dependencies, make will see the "include depend"
directive before the depend file has been created. To avoid a spurious
warning in this case we use "-include" instead, (which differs precisely
in the fact that it will not emit a diagnostic if the named file does
not exist).
Carl Worth [Wed, 21 Jul 2010 20:17:22 +0000 (13:17 -0700)]
i965: Remove an unused variable.
To quiet a compiler warning.
Carl Worth [Wed, 21 Jul 2010 20:17:05 +0000 (13:17 -0700)]
dri2: Remove an unused variable.
To quiet a compiler warning.
Carl Worth [Wed, 21 Jul 2010 20:13:46 +0000 (13:13 -0700)]
Regenerate program/lex.yy.c
Based on the two recent changes to program_lexer.l.
Carl Worth [Wed, 21 Jul 2010 20:11:46 +0000 (13:11 -0700)]
Avoid more warnings in flex-generated code.
This avoids two "function defined but not used" warnings. For the yyinput
function we define YY_NO_INPUT which tells flex to simply not generate this
function.
For unput, we add a call to this function, but inside a while(0) so
that it will quiet the warning without actually changing any
functionality.
Carl Worth [Wed, 21 Jul 2010 19:49:01 +0000 (12:49 -0700)]
Avoid warnings in flex-generated code.
Add declarations for two functions generated in the flex ouput. It
would be nicer if flex simply declared these generated functions as
static, but for now we can at least avoid the warning this way.
Brian Paul [Wed, 21 Jul 2010 17:37:13 +0000 (11:37 -0600)]
draw: tweak aa line width threshold and sampling
Set sampler max_lod to avoid sampling the 1x1 and 2x2 mipmap levels.
Fixes piglit line-aa-width test, fd.o bug 29160.
Patrice Mandin [Wed, 21 Jul 2010 17:28:45 +0000 (19:28 +0200)]
nouveau/nvfx: Add new PIPE_CAP values
Signed-off-by: Patrice Mandin <patmandin@gmail.com>
Brian Paul [Wed, 21 Jul 2010 15:59:23 +0000 (09:59 -0600)]
gallivm: replace has_indirect_addressing field with indirect_files field
Instead of one big boolean indicating indirect addressing, use a
bitfield indicating which register files are accessed with indirect
addressing.
Most shaders that use indirect addressing only use it to access the
constant buffer. So no need to use an array for temporary registers
in this case.
Brian Paul [Wed, 21 Jul 2010 15:51:11 +0000 (09:51 -0600)]
tgsi: added tgsi_shader_info::indirect_files field
Indicates which register files are accessed with indirect addressing.
Brian Paul [Wed, 21 Jul 2010 15:42:11 +0000 (09:42 -0600)]
gallivm: refactor code into get_indirect_offsets() function
Brian Paul [Wed, 21 Jul 2010 15:17:47 +0000 (09:17 -0600)]
gallivm: added comment
Brian Paul [Wed, 21 Jul 2010 15:16:02 +0000 (09:16 -0600)]
gallivm: remove extraneous braces
Brian Paul [Wed, 21 Jul 2010 15:15:30 +0000 (09:15 -0600)]
gallivm: no longer do indirect addressing in get_temp_ptr()
Brian Paul [Wed, 21 Jul 2010 15:10:49 +0000 (09:10 -0600)]
gallivm: implement correct indirect addressing of temp registers
As with indexing the const buffer, the ADDR reg may have totally
different values for each element. Need to use a gather operation.
Brian Paul [Wed, 21 Jul 2010 14:18:56 +0000 (08:18 -0600)]
gallivm: re-org, comments for get_temp_ptr()
Brian Paul [Wed, 21 Jul 2010 14:13:02 +0000 (08:13 -0600)]
draw: whitespace clean-up
Keith Whitwell [Wed, 21 Jul 2010 14:39:09 +0000 (15:39 +0100)]
gallium: remove pointless bitfield restrction in pipe_vertex_element
This used to be a somewhat packed struct, but no longer. Remove the
last remaining bitfield tag.
Brian Paul [Wed, 21 Jul 2010 14:08:12 +0000 (08:08 -0600)]
gallivm: rename a var to avoid compiler warnings
Brian Paul [Wed, 21 Jul 2010 00:48:53 +0000 (18:48 -0600)]
gallivm: fix indirect addressing of constant buffer
The previous code assumed that all elements of the address register
were the same. But it can vary from pixel to pixel or vertex to
vertex so we must use a gather operation when dynamically indexing
the constant buffer.
Still need to fix this for the temporary register file...
Brian Paul [Wed, 21 Jul 2010 00:45:45 +0000 (18:45 -0600)]
gallivm: added lp_build_const_int32() helper
Vinson Lee [Tue, 20 Jul 2010 21:18:42 +0000 (14:18 -0700)]
radeon: Remove unnecessary header.
Jerome Glisse [Tue, 20 Jul 2010 19:04:55 +0000 (15:04 -0400)]
r600g: split trans unit computation
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Marek Olšák [Sat, 5 Jun 2010 17:32:29 +0000 (19:32 +0200)]
st/mesa: implement and advertise GL_ARB_draw_elements_base_vertex
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Tue, 20 Jul 2010 17:46:43 +0000 (11:46 -0600)]
draw: correctly handle max_index=0xffffffff case in vcache code
If max_index=0xffffffff and elt_bias > 0 the test for
elt_bias + max_index >= DRAW_PIPE_MAX_VERTICES
was wrong. Check earlier if max_index=0xffffffff and do the
"fail" case.
This fixes the piglit draw-elements-base-vertex test (and probably
some other things).
Marek Olšák [Mon, 19 Jul 2010 18:46:15 +0000 (20:46 +0200)]
st/mesa: implement depth texture modes
Brian Paul [Tue, 20 Jul 2010 14:40:19 +0000 (08:40 -0600)]
mesa: call ctx->Driver.ChooseTextureFormat() only when necessary.
When defining mipmap level 'L' and level L-1 exists and the new level's
internalFormat matches level L-1's internalFormat, then use the same hw
format. Otherwise, do the regular ctx->Driver.ChooseTextureFormat() call.
This avoids a problem where we end up choosing different hw formats for
different mipmap levels depending on how the levels are defined (glTexImage
vs. glCopyTexImage vs. glGenerateMipmap, etc).
The root problem is the ChooseTextureFormat() implementation in some
drivers uses the user's glTexImage format/type parameters in the choosing
heuristic. Later mipmap levels might be generated with different calls
(ex: glCopyTexImage()) so we don't always have format/type info and the
driver may choose a different format.
For more background info see the July 2010 mesa-dev thread "Bug in
_mesa_meta_GenerateMipmap"
Brian Paul [Tue, 20 Jul 2010 14:39:30 +0000 (08:39 -0600)]
graw/tests: pass -e option to test draw_elements_instanced()
Michal Krol [Tue, 20 Jul 2010 13:00:28 +0000 (15:00 +0200)]
softpipe: Support non-depth-stencil formats in sp_tile_cache_flush_clear().
Kristian Høgsberg [Tue, 20 Jul 2010 11:43:50 +0000 (07:43 -0400)]
glx: #ifdef DRI specific prototype
https://bugs.freedesktop.org/show_bug.cgi?id=29162
Michel Dänzer [Tue, 20 Jul 2010 10:21:17 +0000 (12:21 +0200)]
glx/dri2: Fix dri2CopySubBuffer() again.
Only refresh the fake front buffer if there is one, and only destroy the region
once.
Fixes X11 protocol errors reported by 'mcgreg' on IRC.
Marek Olšák [Mon, 19 Jul 2010 21:26:17 +0000 (23:26 +0200)]
util: mempool: initialize last block's magic number in a page
Chia-I Wu [Tue, 20 Jul 2010 03:49:59 +0000 (11:49 +0800)]
st/egl: Fixes for recent GLX cleanup.
Mainly, the type of __GLXdisplayPrivateRec::screenConfigs has changed
from "__GLXscreenConfigs *" to "__GLXscreenConfigs **".
Chia-I Wu [Tue, 20 Jul 2010 04:35:47 +0000 (12:35 +0800)]
st/dri: Remove driFrameTrackingExtension.
The extension has been removed in
22266c391fbe17603b15a83d4ccf5fa9455ccf8d.
Kristian Høgsberg [Tue, 20 Jul 2010 02:40:22 +0000 (22:40 -0400)]
glx: Move DRI CopySubBuffer extension to DRI1 code
We do this in the X server for DRI2.
Kristian Høgsberg [Tue, 20 Jul 2010 02:12:22 +0000 (22:12 -0400)]
glx: Move driver_configs to DRI screen privates
Kristian Høgsberg [Tue, 20 Jul 2010 01:15:50 +0000 (21:15 -0400)]
glx: Move drawHash to display private
The XIDs are display wide so the natural location of the hash is here.
This way we don't have to lookup in each of the screen hashes.
Kristian Høgsberg [Tue, 20 Jul 2010 01:00:09 +0000 (21:00 -0400)]
glx: Don't use __glXInitialize() when we might be holding __glXLock()
Kristian Høgsberg [Tue, 20 Jul 2010 00:01:59 +0000 (20:01 -0400)]
glx: Workaround mismatch in signedness between extensions and protocol
The DRI2 protocol for ust, msc and sbc are unsigned but the extensions
talk about int64_t. Do a little dance to make the compiler shut up.
Kristian Høgsberg [Mon, 19 Jul 2010 22:11:03 +0000 (18:11 -0400)]
glx: Move __DRIdrawable pointers to DRI drawable privates
Kristian Høgsberg [Mon, 19 Jul 2010 21:15:42 +0000 (17:15 -0400)]
glx: Remove support for MESA_swap_frame_usage
The extension never worked, the implementation returns GLX_BAD_CONTEXT
when enabling the frame tracking.
Kristian Høgsberg [Mon, 19 Jul 2010 20:45:23 +0000 (16:45 -0400)]
glx: Move __driScreen into the dri screen privates
Kristian Høgsberg [Mon, 19 Jul 2010 20:39:53 +0000 (16:39 -0400)]
glx: Move DRI1 specific extensions and code to DRI1 screen private
Kristian Høgsberg [Mon, 19 Jul 2010 19:35:48 +0000 (15:35 -0400)]
glx: Move DRI2 extensions to DRI2 screen private
Kristian Høgsberg [Mon, 19 Jul 2010 19:15:15 +0000 (15:15 -0400)]
glx: Drop support for GLX_MESA_allocate_memory
Only r200 implemented it.
Kristian Høgsberg [Mon, 19 Jul 2010 18:57:59 +0000 (14:57 -0400)]
glx: Add screen privates for dri drivers and moved some fields there
GLXscreenConfigs is badly named and a dumping ground for a lot of stuff.
This patch creates private screen structs for the dri drivers and moves
some of their fields over there.
Kristian Høgsberg [Mon, 19 Jul 2010 14:51:09 +0000 (10:51 -0400)]
glx: Rename various DRI structs away from obnoxious __GLXfooRec convention
Enough is enough.
Kristian Høgsberg [Mon, 19 Jul 2010 14:32:02 +0000 (10:32 -0400)]
glx: Factor out common code from dri2WaitGL() and dri2WaitX()
Kristian Høgsberg [Mon, 19 Jul 2010 14:19:22 +0000 (10:19 -0400)]
glx: Dont use dri2WaitX() to update fake front
This saves a superfluous flush and a create/destryo region.
Eric Anholt [Tue, 20 Jul 2010 00:22:20 +0000 (17:22 -0700)]
i965: Mostly fix glsl-max-varyings.
There was confusion on both the size of message we can send, and on
what the URB destination offset means.
The remaining problems appear to be due to spilling of regs in the
fragment shader being broken.
Eric Anholt [Tue, 20 Jul 2010 00:02:52 +0000 (17:02 -0700)]
i965: Clean up message register setup in emit_vertex_write().
Eric Anholt [Mon, 19 Jul 2010 23:44:38 +0000 (16:44 -0700)]
i965: Reduce repeated calculation of the attribute-offset-in-VUE.
This cleans up some chipset dependency sprinkled around, and fixes a
potential overflow of the attribute offset array for many vertex
results.
Eric Anholt [Mon, 19 Jul 2010 23:11:19 +0000 (16:11 -0700)]
i965: Clarify the nr_regs calculation in brw_clip.c
Eric Anholt [Mon, 19 Jul 2010 22:54:15 +0000 (15:54 -0700)]
i965: Don't set up VUE space for the disabled user clip distances on gen6.
Brian Paul [Tue, 20 Jul 2010 00:29:12 +0000 (18:29 -0600)]
draw: fix incorrect instancing divisor in LLVM code
Brian Paul [Mon, 19 Jul 2010 21:28:53 +0000 (15:28 -0600)]
mesa: remove restart.c from build
Marek Olšák [Mon, 19 Jul 2010 18:47:30 +0000 (20:47 +0200)]
r300g: fix possible crash in destroy_context
The problem is destroy_context is almost NEVER called.
The only test for destroy_context I know is compiz.
Reported by Vinson Lee.
FDO bug #29150.
Marek Olšák [Mon, 19 Jul 2010 16:08:53 +0000 (18:08 +0200)]
util: remove the dummy field in mempool
It should allocate less memory now.
Vinson Lee [Mon, 19 Jul 2010 18:31:44 +0000 (11:31 -0700)]
scons: Fix Mac OS X SCons build on 32-bit CPUs.
The Mac OS X SCons build failed on 32-bit CPUs starting with commit
2f6d47a7c8d6e69e5154de44115aab9ba35a41d2 during linking of graw-null.
The build succeeds though on a 64-bit CPU. See FDO bug 29117.
This was the compiler error.
scons: building associated VariantDir targets: build/darwin-x86-debug
Linking build/darwin-x86-debug/gallium/targets/graw-null/libgraw.dylib ...
Undefined symbols:
"_lp_swizzled_cbuf", referenced from:
_lp_swizzled_cbuf$non_lazy_ptr in libllvmpipe.a(lp_rast.os)
_lp_swizzled_cbuf$non_lazy_ptr in libllvmpipe.a(lp_rast_tri.os)
(maybe you meant: _lp_swizzled_cbuf$non_lazy_ptr)
"_lp_dummy_tile", referenced from:
_lp_dummy_tile$non_lazy_ptr in libllvmpipe.a(lp_rast.os)
_lp_dummy_tile$non_lazy_ptr in libllvmpipe.a(lp_rast_tri.os)
_lp_dummy_tile$non_lazy_ptr in libllvmpipe.a(lp_setup.os)
(maybe you meant: _lp_dummy_tile$non_lazy_ptr)
The patch adds -fno-common to all Mac OS X builds to work around this issue.
Brian Paul [Mon, 19 Jul 2010 16:50:08 +0000 (10:50 -0600)]
util: add dummy field to empty structure types
Empty structure types aren't allowed with MSVC.
I haven't tested this change. Hope I haven't broken it...
Marek Olšák [Mon, 19 Jul 2010 15:33:40 +0000 (17:33 +0200)]
r300g: fix typo
Marek Olšák [Mon, 19 Jul 2010 12:31:25 +0000 (14:31 +0200)]
r300g: use memory pools for buffer_create and get_transfer
The improvement in Tremulous: 68.9 fps -> 71.1 fps.
Marek Olšák [Mon, 19 Jul 2010 09:04:30 +0000 (11:04 +0200)]
util: add a memory pool for equally sized memory allocations
malloc/free are in O(1).
Marek Olšák [Sat, 17 Jul 2010 13:55:24 +0000 (15:55 +0200)]
st/mesa: fix FRAMEBUFFER_UNSUPPORTED with the D24S8 format
Fixes FDO bug #29116.
NOTE: this is a candidate for the 7.8 branch