Eric Anholt [Mon, 23 Aug 2010 16:47:15 +0000 (09:47 -0700)]
mesa: Don't add 1 to GL_ACTIVE_UNIFORM_MAX_LENGTH.
Fixes: glsl-getactiveuniform-length.
Roland Scheidegger [Mon, 23 Aug 2010 15:55:16 +0000 (17:55 +0200)]
util: fix util_fill_rect to take util_color instead of u32 param
util_fill_rect could not handle formats with more than 32 bits,
since the fill color was a uint32_t value. Fix this by using
a util_color union instead, and also expand the union so it
works with formats which have up to 256 bits (the max of any
format currently defined).
Luca Barbieri [Mon, 23 Aug 2010 14:43:04 +0000 (16:43 +0200)]
nvfx: emit bo relocations only when needed
Should improve performance, possibly significantly.
Eric Anholt [Mon, 23 Aug 2010 14:05:07 +0000 (07:05 -0700)]
glsl2: Add missing sig_iter.next() to the no-constant-folding-to-outvals fix.
Luca Barbieri [Mon, 23 Aug 2010 13:20:31 +0000 (15:20 +0200)]
nvfx: match Gallium's gl_PointCoord brokenness
Gallium always puts gl_PointCoord in GENERIC[0] if
point_quad_rasterization is enabled.
This is silly, but for now it makes mesa-demos/glsl/pointcoord work.
Luca Barbieri [Sun, 22 Aug 2010 22:31:08 +0000 (00:31 +0200)]
nvfx: support clip planes sensibly and fix them on nv30
Before, we were discarding the compiled vertex program on each
vertex program change.
Now we compile the program as if there were 6 clip planes and
dynamically patch in an "end program" bit at the right place.
Also, nv30 should now work.
Dave Airlie [Mon, 23 Aug 2010 10:28:02 +0000 (20:28 +1000)]
r300g: avoid stall in no-tcl drawing when mapping vbo
the current code reuses the same vbo over and over, however after a flush
we'd stall and wait for mapping on the vbo when we should just fire and forget.
On a gears test this brings me from ~620 to ~750 on my rv530 in swtcl mode.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Chia-I Wu [Mon, 23 Aug 2010 08:13:12 +0000 (16:13 +0800)]
glapi: Clean up header inclusions.
Do not rely on PUBLIC being defined in glapi.h. Do not include core
mesa headers.
Chia-I Wu [Sat, 21 Aug 2010 10:20:39 +0000 (18:20 +0800)]
mesa: Assorted fixes for es_generator.py on win32.
Fix mixed use of GL_APIENTRY and GLAPIENTRY. Parameter list of a function
prototype should never be empty.
Zhenyu Wang [Mon, 23 Aug 2010 02:16:45 +0000 (10:16 +0800)]
i965: Add sandybridge D0 pci ids
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Eric Anholt [Mon, 23 Aug 2010 01:53:33 +0000 (18:53 -0700)]
mesa: Fix typo in autoconf.in that made talloc cflags still detect at runtime.
Marek Olšák [Sat, 14 Aug 2010 15:47:34 +0000 (08:47 -0700)]
st/mesa: implement depth-only blit for BlitFramebuffer
Signed-off-by: Brian Paul <brianp@vmware.com>
Marek Olšák [Mon, 23 Aug 2010 01:29:32 +0000 (19:29 -0600)]
util: implement depth blitting in u_blit
Signed-off-by: Brian Paul <brianp@vmware.com>
Marek Olšák [Sat, 14 Aug 2010 15:47:32 +0000 (08:47 -0700)]
st/mesa: fix BlitFramebuffer for D24S8 textures
This is the same issue as in the previous patch, but here the Blit is not
implemented for separate depth and stencil buffers at all (such
a configuration is not supported in Gallium) and the code incorrectly treated
a D24S8 texture as two separate buffers, making this Blit a no-op.
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Mon, 23 Aug 2010 01:34:53 +0000 (19:34 -0600)]
st/mesa: added st_is_depth_stencil_combined() function
This code is part of a patch by Marek Olšák.
Eric Anholt [Mon, 23 Aug 2010 01:26:42 +0000 (18:26 -0700)]
glsl: Don't constant-fold in a constant in place of a function outval.
Eric Anholt [Mon, 23 Aug 2010 01:15:20 +0000 (18:15 -0700)]
glsl: Convert constant folding to the rvalue visitor.
This should be mostly a noop, except that a plain dereference of a
variable that is not part of a constant expression could now get
"constant folded". I expect that for all current backends this will
be either a noop, or possibly a win when it provokes more
ir_algebraic. It'll also ensure that when new features are added,
tree walking will work normally. Before this, constants weren't
getting folded inside of loops.
Eric Anholt [Mon, 23 Aug 2010 01:25:55 +0000 (18:25 -0700)]
glsl: Don't tree-graft in an expression in place of a function outval.
Fixes: glsl-constant-folding-call-1 (bug #29737)
Brian Paul [Mon, 23 Aug 2010 01:04:47 +0000 (19:04 -0600)]
st/mesa: fix ReadPixels crashes when reading depth/stencil from a FBO
This is based on a patch from Marek Olšák.
NOTE: This is a candidate for the Mesa 7.8 branch.
Brian Paul [Mon, 23 Aug 2010 00:54:50 +0000 (18:54 -0600)]
mesa: use driver hook for creating new renderbuffers
Brian Paul [Mon, 23 Aug 2010 00:48:28 +0000 (18:48 -0600)]
st/mesa: clean-up pipe_get_transfer() calls
Eric Anholt [Mon, 23 Aug 2010 00:34:18 +0000 (17:34 -0700)]
mesa: AC_SUBST the talloc libs/cflags so the ./configure results are saved.
I had used pkg-config from the Makefile because I didn't want to screw
around with the non-autoconf build, but that doesn't work because the
PKG_CONFIG_PATH or TALLOC_LIBS/TALLOC_CFLAGS that people set at
configure time needs to be respected and may not be present at build
time.
Bug #29585
Luca Barbieri [Sun, 22 Aug 2010 22:16:23 +0000 (00:16 +0200)]
nvfx: fix minor memory leak
Luca Barbieri [Sun, 22 Aug 2010 21:29:34 +0000 (23:29 +0200)]
nvfx: support both sprite coord origins
Now we lie less when claiming OpenGL 2 support.
Also, first piglit result group is now all green, except for
fdo25614-genmipmap, which seems mesa/st's fault.
Luca Barbieri [Sun, 22 Aug 2010 19:41:49 +0000 (21:41 +0200)]
nvfx: use 64-bit bitmasks for temps
Jerome Glisse [Sun, 22 Aug 2010 21:13:58 +0000 (17:13 -0400)]
r600g: fix DB decompression
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Vinson Lee [Sun, 22 Aug 2010 19:45:04 +0000 (12:45 -0700)]
nvfx: Include missing header in nvfx_vertprog.c.
Include draw_context.h for draw_*_vertex_shader symbols.
Fixes the following GCC warning.
nvfx_vertprog.c: In function 'nvfx_vp_state_create':
nvfx_vertprog.c:1276: warning: implicit declaration of function 'draw_create_vertex_shader'
nvfx_vertprog.c:1276: warning: assignment makes pointer from integer without a cast
nvfx_vertprog.c: In function 'nvfx_vp_state_delete':
nvfx_vertprog.c:1298: warning: implicit declaration of function 'draw_delete_vertex_shader'
Jakob Bornecrantz [Sun, 22 Aug 2010 17:58:57 +0000 (19:58 +0200)]
translate_sse: add R32G32B32A32_FLOAT -> X8X8X8X8_UNORM for EMIT_4UB
Changed by me to use movd instead of movss to avoid penalties.
Luca Barbieri [Sun, 22 Aug 2010 16:11:22 +0000 (17:11 +0100)]
translate_sse: refactor constant management
Luca Barbieri [Sun, 22 Aug 2010 14:15:51 +0000 (16:15 +0200)]
nvfx: refactor to support multiple fragment program versions
Luca Barbieri [Sun, 22 Aug 2010 13:48:41 +0000 (15:48 +0200)]
nvfx: move stuff around
Jerome Glisse [Sun, 22 Aug 2010 18:22:00 +0000 (14:22 -0400)]
r600g: depth buffer likely needs decompression when used as texture
Before using depth buffer as texture, it needs to be decompressed
(tile pattern of db are different from one used for colorbuffer
like texture)
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Keith Whitwell [Sun, 22 Aug 2010 13:14:55 +0000 (14:14 +0100)]
glx/xlib: configurable strict/non-strict buffer size invalidate
Introduce a new configuration option XMESA_STRICT_INVALIDATE to switch
between swapbuffers-based and glViewport-based buffer invalidation.
Default strict invalidate to false, ie glViewport-based invalidation,
aka ST_MANAGER_BROKEN_INVALIDATE.
This means we will not call XGetGeometry after every swapbuffers,
which allows swapbuffers to remain asynchronous. For apps running at
100fps with synchronous swapping, a 10% boost is typical. For gears,
I see closer to 20% speedup.
Note that the work of copying data on swapbuffers doesn't disappear -
this change just allows the X server to execute the PutImage
asynchronously without us effectively blocked until its completion.
This applies even to llvmpipe's threaded rasterization as the
swapbuffers operation was a large part of the serial component of an
llvmpipe frame.
The downside of this is correctness - applications which don't call
glViewport on window resizes will get incorrect rendering, unless
XMESA_STRICT_INVALIDATE is set.
The ultimate solution would be to have per-frame but asynchronous
invalidation. Xcb almost looks as if it could provide this, but the
API doesn't seem to quite be there.
Keith Whitwell [Sun, 22 Aug 2010 11:31:18 +0000 (12:31 +0100)]
llvmpipe: reduce size of fragment shader variant key
Don't spend as much time comparing them.
Keith Whitwell [Sun, 22 Aug 2010 11:16:45 +0000 (12:16 +0100)]
llvmpipe: remove unused member from lp_fragment_shader_variant_key
Keith Whitwell [Sun, 22 Aug 2010 10:43:01 +0000 (11:43 +0100)]
llvmpipe: don't clear unused bins
If bins outside the current scene bounds are being corrupted, we'll
need to fix that separately. Currently seems ok though.
Keith Whitwell [Sat, 21 Aug 2010 21:51:38 +0000 (22:51 +0100)]
draw: reduce the size of the llvm variant key
Keith Whitwell [Thu, 19 Aug 2010 23:14:47 +0000 (00:14 +0100)]
glx/xlib: remove another XSync
With this change, xmesa_get_window_size still does one round trip, but
that's better than doing two.
Keith Whitwell [Thu, 19 Aug 2010 23:08:22 +0000 (00:08 +0100)]
glx/xlib: no need to call XSync from XMesaFlush
Try to eliminate some unnecessary X server round trips.
Luca Barbieri [Sun, 22 Aug 2010 10:02:41 +0000 (12:02 +0200)]
nvfx: simplify and correct fragment program update logic
This version should hopefully be much clearer and thus less likely
to be subtly broken.
Also fixes point sprites on nv40 and possibly some other bugs too.
Luca Barbieri [Sun, 22 Aug 2010 09:58:54 +0000 (11:58 +0200)]
nvfx: make stipple setting independent of enable
Luca Barbieri [Sun, 22 Aug 2010 12:53:49 +0000 (14:53 +0200)]
nvfx: fix vertex programs
Luca Barbieri [Sat, 21 Aug 2010 22:21:55 +0000 (00:21 +0200)]
nvfx: use relocations array for vp constants
Henri Verbeet [Mon, 16 Aug 2010 20:18:37 +0000 (22:18 +0200)]
r600g: Don't blindly unmap NULL->size.
There may actually be something mapped in that range, especially for large
buffers like e.g. the GL Drawable.
José Fonseca [Sun, 15 Aug 2010 12:36:02 +0000 (13:36 +0100)]
svga: Do not shortcut NULL surface relocations with SVGA3D_INVALID_ID.
How to cope with NULL surface relocations should be entirely at winsys'
discretion.
Eric Anholt [Sun, 22 Aug 2010 07:47:45 +0000 (00:47 -0700)]
i965: Fix 8-wide FB writes on gen6.
My merge of Zhenyu's patch on top of my previous patches broke it by
my code expecting simd16 single write and Zhenyu's simd8 path being
disabled by mine. Merge the two for success.
Eric Anholt [Sun, 22 Aug 2010 07:44:28 +0000 (00:44 -0700)]
i965: Fix brw_math1 with scalar argument in gen6 FS.
The docs claim two conflicting things: One, that a scalar source is
supported. Two, source hstride must be 1 and width must be exec size.
So splat a constant argument out into a full reg to operate on, since
violating the second set of constraints is clearly failing.
The alternative here might be to do a 1-wide exec on a constant
argument for math1. It would probably save cycles too. But I'll
leave that for the glsl2-965 branch.
Fixes glsl-algebraic-div-one-2.shader_test.
Eric Anholt [Sun, 22 Aug 2010 07:26:09 +0000 (00:26 -0700)]
i965: Fix up WM push constant setup on gen6.
Fixes glsl-algebraic-add-add-1.
Eric Anholt [Sun, 22 Aug 2010 06:47:06 +0000 (23:47 -0700)]
i965: Use intel->gen >= 6 instead of IS_GEN6.
Vinson Lee [Sun, 22 Aug 2010 07:30:47 +0000 (00:30 -0700)]
libgl-xlib: Include missing header in xlib.c.
Include st_api.h for st_api_create_OpenGL symbol.
Vinson Lee [Sun, 22 Aug 2010 07:16:54 +0000 (00:16 -0700)]
nvfx: Silence unused variable warning.
The variable is used but only in the body of an assert.
Vinson Lee [Sun, 22 Aug 2010 07:09:43 +0000 (00:09 -0700)]
mesa: Initialize member variables in ir_to_mesa_src_reg constructor.
The default constructor did not initialize some member variables.
Vinson Lee [Sun, 22 Aug 2010 06:56:24 +0000 (23:56 -0700)]
mesa: Initialize variables in mesa_src_reg_from_ir_src_reg.
Vinson Lee [Sun, 22 Aug 2010 06:36:30 +0000 (23:36 -0700)]
util: Use #ifdef instead of #if.
This is a typo fix of earlier commit
0f3b3751b8643352dcc242567b3696bd1505df1d.
Vinson Lee [Sun, 22 Aug 2010 06:28:52 +0000 (23:28 -0700)]
util: Define dump_cpu only for DEBUG builds.
dump_cpu is used only when DEBUG is defined.
Fixes the following GCC warning on builds without DEBUG defined.
util/u_cpu_detect.c:76: warning: 'debug_get_option_dump_cpu' defined but not used
Vinson Lee [Sun, 22 Aug 2010 06:24:28 +0000 (23:24 -0700)]
translate_sse: Silence uninitialized variable warnings.
Initialize variables on error paths.
Vinson Lee [Sun, 22 Aug 2010 05:59:46 +0000 (22:59 -0700)]
nvfx: Silence uninitialized variable warnings.
Variables weren't initialized on the error paths.
Vinson Lee [Sun, 22 Aug 2010 05:45:09 +0000 (22:45 -0700)]
i965g: Silence printf format warnings on 64-bit builds.
Vinson Lee [Sun, 22 Aug 2010 05:09:47 +0000 (22:09 -0700)]
nvfx: Silence uninitialized variable warnings.
Silence the following i686-apple-darwin10-gcc-4.2.1 warnings.
nv04_2d.c: In function 'nv04_region_copy_cpu':
nv04_2d.c:560: warning: 'dswy' may be used uninitialized in this function
nv04_2d.c:559: warning: 'dswx' may be used uninitialized in this function
nv04_2d.c:562: warning: 'sswy' may be used uninitialized in this function
nv04_2d.c:561: warning: 'sswx' may be used uninitialized in this function
Vinson Lee [Sun, 22 Aug 2010 05:01:04 +0000 (22:01 -0700)]
nv50: Silence incompatible pointer type initialization warning.
Silence the following GCC warning.
warning: initialization from incompatible pointer type
Vinson Lee [Sun, 22 Aug 2010 04:42:17 +0000 (21:42 -0700)]
nv50: Disable unused code.
Disable release_hw and emit_mov_from_pred functions as they are
currently not being used.
Vinson Lee [Sun, 22 Aug 2010 04:27:43 +0000 (21:27 -0700)]
i965g: Fix printf format warning on 32-bit platforms.
Fixes the following GCC warning on 32-bit platforms.
warning: format '%li' expects type 'long int', but argument 4 has type 'int'
Vinson Lee [Sun, 22 Aug 2010 03:38:07 +0000 (20:38 -0700)]
glsl: Silence uninitialized variable warning.
i686-apple-darwin10-gcc-4.2.1 generated the following warning.
warning: 'score' may be used uninitialized in this function
GCC 4.4.3 on Linux didn't generate the above warning.
Jerome Glisse [Sun, 22 Aug 2010 02:49:22 +0000 (22:49 -0400)]
r600g: partialy fix texturing from depth buffer + initial support for untiling
Partialy fix texturing from depth buffer, depth buffer is tiled
following different tile organisation that color buffer. This
properly set the tile type & array mode field of texture sampler
when sampling from db resource.
Add initial support to untiling buffer when transfering them,
it's kind of broken by corruption the vertex buffer of previous
draw.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
José Fonseca [Sun, 22 Aug 2010 01:26:09 +0000 (02:26 +0100)]
draw: Don't assert if indices point outside vertex buffer.
This is valid input, and asserting here does causes the test suites that
verify this to crash.
Also, the assert was wrongly accepting the case
max_index == vert_info->count
which, IIUC, is the first vertex outside the buffer. Assuming the
vert_info->count is precise (which often is not the case).
José Fonseca [Sat, 21 Aug 2010 14:04:47 +0000 (15:04 +0100)]
mesa: Removed another unused variable.
Vinson Lee [Sat, 21 Aug 2010 23:21:41 +0000 (16:21 -0700)]
glsl: Silence unused variable warning.
The variable is actually used but only in the body of an assert.
Vinson Lee [Sat, 21 Aug 2010 22:48:25 +0000 (15:48 -0700)]
util: Silence uninitialized variable warnings.
Kenneth Graunke [Sat, 21 Aug 2010 22:30:34 +0000 (15:30 -0700)]
glsl: Handle array declarations in function parameters.
The 'vec4[12] foo' style already worked, but the 'vec4 foo[12]' style
did not. Also, 'vec4[] foo' was wrongly accepted.
Fixes piglit test cases array-19.vert and array-21.vert.
May fix fd.o bug #29684 (or at least part of it).
Luca Barbieri [Sat, 21 Aug 2010 21:53:39 +0000 (23:53 +0200)]
nvfx: actually fix it properly
Luca Barbieri [Sat, 21 Aug 2010 21:33:51 +0000 (23:33 +0200)]
nvfx: fix incorrect assert
Vinson Lee [Sat, 21 Aug 2010 21:36:29 +0000 (14:36 -0700)]
util: Move loop variable declaration outside for loop.
Fixes build error with MSVC.
Vinson Lee [Sat, 21 Aug 2010 21:29:50 +0000 (14:29 -0700)]
nvfx: Fix SCons build.
Move declarations before code.
Fix void pointer arithmetic.
Luca Barbieri [Sat, 21 Aug 2010 20:48:29 +0000 (22:48 +0200)]
nvfx: fix warnings
José Fonseca [Sat, 21 Aug 2010 20:58:22 +0000 (21:58 +0100)]
gallivm: Emit DIVPS instead of RCPPS.
See comments for detailed rationale.
Thanks to Michal Krol and Zack Rusin for detecting and investigating this
in detail.
Luca Barbieri [Sat, 21 Aug 2010 19:29:18 +0000 (21:29 +0200)]
nvfx: enable translate_sse
Vinson Lee [Sat, 21 Aug 2010 19:32:17 +0000 (12:32 -0700)]
auxiliary: Add missing files to SCons build.
Add u_linear.c and u_linkages.c to SCons build.
Reorder list of files to be more alphabetical.
Vinson Lee [Sat, 21 Aug 2010 19:21:59 +0000 (12:21 -0700)]
auxiliary: Reorder list of files in Makefile.
This patch reorders the list of files so that the order is more alphabetic.
Vinson Lee [Sat, 21 Aug 2010 19:00:57 +0000 (12:00 -0700)]
scons: Fix nvfx build.
Luca Barbieri [Sat, 21 Aug 2010 18:23:41 +0000 (20:23 +0200)]
nvfx: slightly improve handling of overlong vps
Luca Barbieri [Sat, 21 Aug 2010 18:14:35 +0000 (20:14 +0200)]
nvfx: tweak CMP in fp
Luca Barbieri [Sat, 21 Aug 2010 18:14:16 +0000 (20:14 +0200)]
nvfx: implement CMP in vp
Luca Barbieri [Sat, 21 Aug 2010 18:07:48 +0000 (20:07 +0200)]
nvfx: implement TXL in fp
Luca Barbieri [Sat, 21 Aug 2010 18:05:04 +0000 (20:05 +0200)]
nvfx: implement SSG in fp
Luca Barbieri [Sat, 21 Aug 2010 17:43:46 +0000 (19:43 +0200)]
nvfx: implement DP2 in vp and fp
Luca Barbieri [Sat, 21 Aug 2010 17:35:06 +0000 (19:35 +0200)]
nvfx: implement TRUNC in vp and fp
Luca Barbieri [Sat, 21 Aug 2010 17:45:06 +0000 (19:45 +0200)]
nvfx: implement NOP
Luca Barbieri [Sat, 21 Aug 2010 16:37:21 +0000 (18:37 +0200)]
nvfx: add vertex program control flow
Luca Barbieri [Sat, 21 Aug 2010 16:37:01 +0000 (18:37 +0200)]
nvfx: fix vertex shader headers
Luca Barbieri [Fri, 20 Aug 2010 19:16:49 +0000 (21:16 +0200)]
nv40: add fragment program control flow
Luca Barbieri [Sat, 21 Aug 2010 10:32:59 +0000 (12:32 +0200)]
nvfx: refactor shader assembler
Luca Barbieri [Sat, 21 Aug 2010 11:28:38 +0000 (13:28 +0200)]
nvfx: add option to dump shaders in TGSI and native code
Luca Barbieri [Thu, 25 Feb 2010 16:46:37 +0000 (17:46 +0100)]
nvfx: improve and correct nvfx_shader.h
Luca Barbieri [Thu, 19 Aug 2010 20:47:03 +0000 (22:47 +0200)]
nvfx: fix lodbias
Luca Barbieri [Thu, 19 Aug 2010 20:36:00 +0000 (22:36 +0200)]
nvfx: mostly fix inline corruption magically
Not sure why this mostly works.
Luca Barbieri [Thu, 19 Aug 2010 10:58:14 +0000 (12:58 +0200)]
nvfx: fix GPU hardlocks when depth buffer is absent
Luca Barbieri [Mon, 16 Aug 2010 23:01:42 +0000 (01:01 +0200)]
nvfx: fire ring after transfers
Might reduce the risk of running out of memory
Luca Barbieri [Mon, 16 Aug 2010 14:55:00 +0000 (16:55 +0200)]
nv30: band-aid viewport issues
For some reason nv30 seems to like to reset the viewport, even though
attempts to isolate where exactly it does that have currently been
inconclusive.
Luca Barbieri [Sun, 15 Aug 2010 08:15:40 +0000 (10:15 +0200)]
nvfx: support flatshade_first
Luca Barbieri [Sat, 13 Mar 2010 01:28:59 +0000 (02:28 +0100)]
nvfx: expose GLSL
Still no control flow support, but basic stuff works.