OSDN Git Service
Alex Deucher [Thu, 9 Jul 2009 21:15:23 +0000 (17:15 -0400)]
R6xx/r7xx: disable CS dump
Don't fprintf to a xterm with the lock held.
Richard Li [Wed, 8 Jul 2009 18:49:48 +0000 (14:49 -0400)]
Fix buffer age implementaion bug.
Alex Deucher [Tue, 7 Jul 2009 19:44:44 +0000 (15:44 -0400)]
R6xx/r7xx: remove some left over debugging
Alex Deucher [Tue, 7 Jul 2009 19:40:28 +0000 (15:40 -0400)]
R6xx/R7xx: fix texture reloc emit
Textures don't look right yet, but tex demos run.
Alex Deucher [Tue, 7 Jul 2009 06:12:38 +0000 (02:12 -0400)]
r6xx/r7xx: add sw blit for tex upload
Can be used for buffer swap as well.
Alex Deucher [Tue, 7 Jul 2009 05:02:08 +0000 (01:02 -0400)]
tex wip
Alex Deucher [Mon, 6 Jul 2009 04:00:10 +0000 (00:00 -0400)]
R6xx/r7xx: first pass at texture support
texture bo setup isn't quite working yet
Cooper Yuan [Mon, 6 Jul 2009 08:30:43 +0000 (16:30 +0800)]
R6xx/r7xx: DEPTH_CONTROL will be reset by this function
Richard Li [Thu, 2 Jul 2009 16:08:57 +0000 (12:08 -0400)]
r6xx/r7xx: Better fix for fragment temps
This doesn't waste as many in generic cases.
Cooper Yuan [Thu, 2 Jul 2009 08:52:11 +0000 (16:52 +0800)]
R6xx/r7xx: Fix line width issue, ROUND_MODE and QUANT_MODE aren't bits of LINE_CNTL
Cooper Yuan [Thu, 2 Jul 2009 08:49:19 +0000 (16:49 +0800)]
R6xx/r7xx: Correct the indeices of DRAW_INDEX_IMMD
Alex Deucher [Wed, 1 Jul 2009 18:41:57 +0000 (14:41 -0400)]
r6xx/r7xx: rework aos setup
In theory this should fix the stride = 0 case,
but I can't seem to reproduce that anymore
with mesa master.
Alex Deucher [Wed, 1 Jul 2009 15:10:10 +0000 (11:10 -0400)]
R6xx/R7xx: Fix number of temps used in fragment program
Spotted by Cooper. This gets hello, aargb, smooth, etc.
working.
Alex Deucher [Tue, 30 Jun 2009 22:40:48 +0000 (18:40 -0400)]
R6xx/r7xx: fix locking for clear
this allows redbook hello to render correctly mostly.
Cooper Yuan [Fri, 26 Jun 2009 09:04:53 +0000 (17:04 +0800)]
Fix viewport issue
Cooper Yuan [Thu, 25 Jun 2009 11:48:43 +0000 (19:48 +0800)]
Fix color data can't be fetched issue
Cooper Yuan [Tue, 23 Jun 2009 03:11:19 +0000 (11:11 +0800)]
correct scissor and cliprect setting
Cooper Yuan [Mon, 22 Jun 2009 07:10:57 +0000 (15:10 +0800)]
functions declaration with 'extern'
Cooper Yuan [Mon, 22 Jun 2009 06:33:18 +0000 (14:33 +0800)]
Pass viewport id to r700SendViewportState function, otherwise the radom value may beyond R700_MAX_VIEWPORTS
Cooper Yuan [Mon, 22 Jun 2009 02:16:01 +0000 (10:16 +0800)]
add LINK_STATES for SPI_PS and SEMANTIC
Alex Deucher [Fri, 12 Jun 2009 16:09:34 +0000 (12:09 -0400)]
Merge master and fix conflicts
Jakob Bornecrantz [Fri, 12 Jun 2009 13:55:04 +0000 (14:55 +0100)]
progs/rbug: Add binary to bmp converter program
Jakob Bornecrantz [Fri, 12 Jun 2009 11:31:04 +0000 (12:31 +0100)]
Merge branch 'mesa_7_5_branch'
Jakob Bornecrantz [Thu, 11 Jun 2009 18:26:55 +0000 (19:26 +0100)]
mesa: Enable uploads of only depth to z24s8 textures
Owen W. Taylor [Sat, 6 Jun 2009 18:46:22 +0000 (14:46 -0400)]
Disable SGI_swap_control extension for DRI2
We currently don't have support for SGI_swap_control for direct
contexts with DRI2, so disable reporting the extension. Reporting
the extension, and then having glXSwapIntervalSGI() "succeed"
but do nothing can confuse applications.
https://bugs.freedesktop.org/show_bug.cgi?id=22123
Dave Airlie [Fri, 12 Jun 2009 01:37:13 +0000 (11:37 +1000)]
radeon: fix size of mipmap texture array
Dave Airlie [Fri, 12 Jun 2009 01:35:10 +0000 (11:35 +1000)]
radeon/r200/r300: fix max texture levels assert
use the actual value set in the context
Dave Airlie [Fri, 12 Jun 2009 01:17:32 +0000 (11:17 +1000)]
Merge remote branch 'main/radeon-rewrite'
Alex Deucher [Thu, 11 Jun 2009 22:24:41 +0000 (18:24 -0400)]
Add RV740 support
Maciej Cencora [Wed, 10 Jun 2009 15:05:38 +0000 (17:05 +0200)]
r300: fix VAP setup
If GL context had e.g. tex0, tex2 and fog the VAPOutputCntl1 returned 0x104 instead of 0x124 - that meaned we're sending only 8 texcoords (instead of 12) which ended up in GPU hang.
Maciej Cencora [Wed, 10 Jun 2009 14:58:15 +0000 (16:58 +0200)]
r300: fix for SW TCL path
We shouldn't use i variable for SWTCL_OVM_TEX because textures doesn't have to be enabled in "packed" order.
We could have tex1,tex3 and fog which would receive 7,9,8 OVM locations instead of 6,7,8.
Maciej Cencora [Wed, 10 Jun 2009 14:56:51 +0000 (16:56 +0200)]
r300: don't send unused attributes for SW TCL path
Maciej Cencora [Wed, 10 Jun 2009 14:04:35 +0000 (16:04 +0200)]
r300: send only RS_IP_* regs that we are going to use
Maciej Cencora [Wed, 10 Jun 2009 22:43:55 +0000 (00:43 +0200)]
r300: fix RS setup when no colors and textures are sent to FP
RS_COL_FMT field is part of RS_IP_* reg not RS_INST_*
Maciej Cencora [Wed, 10 Jun 2009 02:09:33 +0000 (04:09 +0200)]
r300: r500 fragment program fixes
- when rewriting per component negate swizzle, first instruction should get not negated source
- KIL instruction ignores swizzles
TODO:
- tex instructions does not support saturation
- tex instructions cannot read from consant memory
Maciej Cencora [Sun, 7 Jun 2009 19:27:52 +0000 (21:27 +0200)]
radeon: increase max bo count
Maciej Cencora [Sun, 7 Jun 2009 19:34:44 +0000 (21:34 +0200)]
r300: fix a GPU lock up
Sending from VAP more texture coordinates than RS expects results in GPU hang.
Fixes BumpSelfShadow from DirectX8 SDK.
Maciej Cencora [Fri, 5 Jun 2009 16:32:05 +0000 (18:32 +0200)]
r300: fix vertex program bug
If the vertex program didn't write position attribute, the position invariant function would add necessary instructions, but the vertex position would be overwritten by artificial outputs insts added to satisfy fragment program requirements.
Fixes "whole screen is gray" problem for HW TCL path in sauerbraten when shaders are enabled, and whole slew of wine d3d9 tests.
Maciej Cencora [Fri, 5 Jun 2009 16:27:00 +0000 (18:27 +0200)]
r300: move some code for easier debugging
Maciej Cencora [Fri, 5 Jun 2009 16:23:55 +0000 (18:23 +0200)]
r300: print vertex program when debugging is enabled
Maciej Cencora [Fri, 5 Jun 2009 16:14:15 +0000 (18:14 +0200)]
r300: fix output register allocation for vertex shaders
If the vertex program wrote secondary color without primary color, the secondary color output register index would be 0 which resulted in overwriting vertex position in some cases.
Maciej Cencora [Fri, 5 Jun 2009 16:00:58 +0000 (18:00 +0200)]
r300: hw doesn't support saturation for tex instructions
Brian Paul [Thu, 11 Jun 2009 20:55:25 +0000 (14:55 -0600)]
mesa: rework vertex shader output / fragment shader input attribute matching
Before, if a vertex shader's outputs didn't exactly match a fragment
shader's inputs we could wind up with invalid TGSI shader declarations.
For example:
Before patch:
DCL OUT[0], POSITION
DCL OUT[1], COLOR[1]
DCL OUT[2], GENERIC[0]
DCL OUT[3], GENERIC[0] <- note duplicate [0]
DCL OUT[4], GENERIC[2]
After patch:
DCL OUT[0], POSITION
DCL OUT[1], COLOR[1]
DCL OUT[2], GENERIC[0]
DCL OUT[3], GENERIC[1]
DCL OUT[4], GENERIC[2]
Brian Paul [Thu, 11 Jun 2009 20:55:14 +0000 (14:55 -0600)]
mesa: add default function for ctx->Driver.CheckQuery() hook
José Fonseca [Thu, 11 Jun 2009 19:46:07 +0000 (20:46 +0100)]
python/retrace: Show the contents of the depth/stencil and surfaces before/after transfers.
José Fonseca [Thu, 11 Jun 2009 18:24:48 +0000 (19:24 +0100)]
python/retrace: Interpret is_texture_referenced/is_buffer_referenced.
José Fonseca [Thu, 11 Jun 2009 18:05:46 +0000 (19:05 +0100)]
wgl: Fix prototype.
José Fonseca [Thu, 11 Jun 2009 18:03:54 +0000 (19:03 +0100)]
Merge branch 'mesa_7_5_branch'
José Fonseca [Thu, 11 Jun 2009 17:53:47 +0000 (18:53 +0100)]
mesa: Use new pf_is_depth_and_stencil inline.
José Fonseca [Thu, 11 Jun 2009 17:53:23 +0000 (18:53 +0100)]
gallium: New pf_is_depth_and_stencil / pf_is_depth_or_stencil inlines.
José Fonseca [Thu, 11 Jun 2009 17:52:17 +0000 (18:52 +0100)]
mesa: Use PIPE_TEXTURE_USAGE_DEPTH_STENCIL for any depth or stencil format.
José Fonseca [Thu, 11 Jun 2009 17:50:36 +0000 (18:50 +0100)]
mesa: Remove dead code.
Brian Paul [Thu, 11 Jun 2009 16:40:19 +0000 (10:40 -0600)]
st/mesa: fix typo s/BFC0/BFC1/
Brian Paul [Wed, 10 Jun 2009 19:00:35 +0000 (13:00 -0600)]
vbo: fix assertion, #define IMM_BUFFER_NAME
This was sometimes seen when Glean exited upon test failure when using
Gallium.
José Fonseca [Thu, 11 Jun 2009 15:34:56 +0000 (16:34 +0100)]
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
José Fonseca [Thu, 11 Jun 2009 15:21:00 +0000 (16:21 +0100)]
python/tests: Test sampling from a depth texture.
Jakob Bornecrantz [Thu, 11 Jun 2009 14:37:53 +0000 (15:37 +0100)]
mesa: Only do read write when we don't have a depth value to write
José Fonseca [Thu, 11 Jun 2009 12:19:34 +0000 (13:19 +0100)]
progs: Port fp programs to GLEW.
José Fonseca [Thu, 11 Jun 2009 11:23:09 +0000 (12:23 +0100)]
mesa: Take the format from the right structure.
José Fonseca [Thu, 11 Jun 2009 10:47:20 +0000 (11:47 +0100)]
meas: Use a read/write transfer when writing stencil component, but not touching the depth component.
Jerome Glisse [Thu, 11 Jun 2009 09:06:14 +0000 (11:06 +0200)]
r300: fix indexed primitive rendering when using memory manager
Alex Deucher [Thu, 11 Jun 2009 05:54:40 +0000 (01:54 -0400)]
Properly set aos_count
This is used by radeonReleaseArrays to free AOS.
Thomas Hellstrom [Wed, 10 Jun 2009 22:54:06 +0000 (00:54 +0200)]
dri st: Don't require the PIPE_TEXTURE_USAGE_RENDER_TARGET property for depth- and stencil renderbuffers.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Michel Dänzer [Thu, 11 Jun 2009 10:11:37 +0000 (12:11 +0200)]
scons: Indent abbreviated command line strings, so command messages stand out.
Also add ASPPCOMSTR.
Michel Dänzer [Thu, 11 Jun 2009 10:09:10 +0000 (12:09 +0200)]
intel: intel_texture_drawpixels() can't handle GL_DEPTH_STENCIL.
Fixes glean depthStencil test.
Alex Deucher [Wed, 10 Jun 2009 22:02:20 +0000 (18:02 -0400)]
move radeon_set_screen_flags() up so CHIP_FAMILY is set before using it
fixes last commit.
Alex Deucher [Wed, 10 Jun 2009 21:56:05 +0000 (17:56 -0400)]
Use correct scratch reg offset for r6xx/r7xx
José Fonseca [Wed, 10 Jun 2009 20:29:25 +0000 (21:29 +0100)]
mesa: Reverse s8z24 into z24s8 as required by EXT_packed_depth_stencil.
Actually, after spotting this problem, I realized this is unreachable
code. However don't bother to enable this fast path now, given the normal
path is working just fine.
José Fonseca [Wed, 10 Jun 2009 20:25:54 +0000 (21:25 +0100)]
mesa: Fix typo in bitmask.
José Fonseca [Wed, 10 Jun 2009 18:58:54 +0000 (19:58 +0100)]
mesa: Fix draw_stencil_pixels for PIPE_FORMAT_Z24S8_UNORM.
Reversed component order.
This fixes glean depthStencil test failures for PIPE_FORMAT_Z24S8_UNORM
visuals.
Brian Paul [Wed, 10 Jun 2009 18:22:36 +0000 (12:22 -0600)]
glsl: fix warnings, update comments, s/TRUE/GL_TRUE/
(cherry picked from master, commit
7fdd64ab29576e607434fb8c82ddfa61e8ea6aa8)
Brian Paul [Wed, 10 Jun 2009 18:21:56 +0000 (12:21 -0600)]
glsl: Handle continuation characters in preprocessor.
(cherry picked from master, commit
cc22620e4b11425997f3bc1fc70f4c88cec22d2e)
Brian Paul [Wed, 10 Jun 2009 18:16:15 +0000 (12:16 -0600)]
glsl: fix warnings, update comments, s/TRUE/GL_TRUE/
Michal Krol [Wed, 10 Jun 2009 17:45:00 +0000 (19:45 +0200)]
glsl: Handle continuation characters in preprocessor.
Brian Paul [Wed, 10 Jun 2009 15:18:22 +0000 (09:18 -0600)]
swrast: fix state validation bug for changing program constants
Add _NEW_PROGRAM_CONSTANTS to _SWRAST_NEW_DERIVED.
This makes sure that we update the fragment shader's constants when state
vars (such as point size) changes.
Fixes the progs/glsl/points.c demo.
Brian Paul [Wed, 10 Jun 2009 14:39:58 +0000 (08:39 -0600)]
glsl: Fix symbol replacement handling in preprocessor.
(cherry picked from master, commit
d9617deb008b75f4a605a30408aeb1948139c33e)
Brian Paul [Wed, 10 Jun 2009 14:39:10 +0000 (08:39 -0600)]
mesa: disable texture unit error check in _mesa_MatrixMode()
See comments for details.
Brian Paul [Tue, 9 Jun 2009 17:56:12 +0000 (11:56 -0600)]
docs: document GLSL preprocessor fixes
José Fonseca [Wed, 10 Jun 2009 14:39:47 +0000 (15:39 +0100)]
util: Single precision constants.
José Fonseca [Wed, 10 Jun 2009 14:39:34 +0000 (15:39 +0100)]
mesa: Single precision constants.
José Fonseca [Wed, 10 Jun 2009 14:39:02 +0000 (15:39 +0100)]
mesa: Pure software accum buffer.
The existing implementation was already implemented on software, but relied
on the pipe driver to always support the R16G16B16A16_SNORM format. This
patch eliminates that, without prejudice against a future hardware-only
implementation.
It also avoids some of the short <-> float conversions, and only does a read
transfer of the color buffer on GL_RETURN if absolutely necessary.
José Fonseca [Wed, 10 Jun 2009 14:31:12 +0000 (15:31 +0100)]
gallium: Shorthand functions for computing stride and sizes for a rect.
Brian Paul [Tue, 9 Jun 2009 17:10:09 +0000 (11:10 -0600)]
gallium: updated PIPE_CAP_x comments
Jerome Glisse [Wed, 10 Jun 2009 12:59:33 +0000 (14:59 +0200)]
r300: make sure indexed rendering doesn't try to use more than the num of vertices
When with memory manager we need to make sure the GPU won't try to access
beyond vertex buffer size, do so by enforcing that the maximun index is the
last vertex of the buffer.
Alex Deucher [Tue, 9 Jun 2009 22:20:57 +0000 (18:20 -0400)]
Pull in additional state setup from the DDX
Keith Whitwell [Tue, 9 Jun 2009 17:32:18 +0000 (18:32 +0100)]
mesa/st: fix tracking of mapped buffer ranges
In st_bufferobj_map_range(), set obj->Offset consistently with its
usage elsewhere.
Keith Whitwell [Tue, 9 Jun 2009 15:35:55 +0000 (16:35 +0100)]
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??
Brian Paul [Tue, 9 Jun 2009 15:14:38 +0000 (09:14 -0600)]
glsl: Expand nested preprocessor macros.
(cherry picked from master, commit
ef8caec29ae73bb2bbeb48f0578d839ef29348cd)
Jakob Bornecrantz [Tue, 9 Jun 2009 05:53:25 +0000 (07:53 +0200)]
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
Michal Krol [Wed, 10 Jun 2009 10:15:13 +0000 (12:15 +0200)]
glsl: Fix symbol replacement handling in preprocessor.
Michal Krol [Wed, 10 Jun 2009 10:01:13 +0000 (12:01 +0200)]
winsys/gdi: Link to ws2_32 library.
Michal Krol [Wed, 10 Jun 2009 09:56:38 +0000 (11:56 +0200)]
trace: __func__ --> __FUNCTION__.
Eric Anholt [Tue, 9 Jun 2009 23:12:43 +0000 (16:12 -0700)]
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.
Eric Anholt [Sat, 6 Jun 2009 07:22:00 +0000 (07:22 +0000)]
intel: Remove an unneeded hunk that slipped in with texture tiling.
intel_miptree_pitch_align does this later on.
Eric Anholt [Sat, 6 Jun 2009 00:52:21 +0000 (00:52 +0000)]
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.
Eric Anholt [Fri, 5 Jun 2009 15:14:15 +0000 (15:14 +0000)]
intel: Fix intel_region_unmap to do unmap, not map.
Thanks to Shuang He for catching this.
Brian Paul [Tue, 9 Jun 2009 21:07:39 +0000 (15:07 -0600)]
i965: added intelFlush() call in intel_get_tex_image()
Fixes the render-to-texture test in progs/tests/getteximage.c
Brian Paul [Tue, 9 Jun 2009 21:06:41 +0000 (15:06 -0600)]
tests: check for GL_EXT/ARB_framebuffer_object
Brian Paul [Tue, 9 Jun 2009 21:05:36 +0000 (15:05 -0600)]
tests: also test glGetTexImage with render to texture
Also, adjust texture dims for the original test.
And use GLEW.
Brian Paul [Tue, 9 Jun 2009 20:03:25 +0000 (14:03 -0600)]
tests: quick and dirty glGetTexImage() test program