summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2009-06-24intel: fix additional merge conflicts missed in previous commitBrian Paul
2009-06-24Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: src/mesa/drivers/dri/i915/i915_tex_layout.c src/mesa/drivers/dri/i965/brw_wm_glsl.c src/mesa/drivers/dri/intel/intel_buffer_objects.c src/mesa/drivers/dri/intel/intel_pixel_bitmap.c src/mesa/drivers/dri/intel/intel_pixel_draw.c src/mesa/main/enums.c src/mesa/main/texstate.c src/mesa/vbo/vbo_exec_array.c
2009-06-24wgl: Handle flush after a window is destroyed.José Fonseca
Fixes assertion failure with conform.
2009-06-24identity: Add new identity driverJakob Bornecrantz
This driver does no transformation of the gallium calls going to the real driver, like the identity matrix. It is intended to be the basis for transforming and/or debug drivers like trace and rbug. Authors of this patch are: Michal Krol, orignal heavy lifting. José Fonesca, object wrapping code stolen from trace. Jakob Bornecrantz, put it all toghether and renamed a stuff.
2009-06-23i965: Disable texture tiling by default.Eric Anholt
I haven't fixed all the regressions yet, and it'll be easy to re-enable when the known problems are fixed.
2009-06-23i965: Set the max index buffer address correctly according to the docs.Eric Anholt
It's the last addressable byte, not the byte after the end of the buffer.
2009-06-23i965: Don't set a reserved bit in MI_FLUSH.Eric Anholt
I noticed this when this MI_FLUSH showed up in IPEHR for the ut2004 hang. Not setting the reserved bit didn't help, though.
2009-06-23dri2: Refresh the fake front contents after glXSwapBuffers().Eric Anholt
Bug #19177. Reviewed by: Ian Romanick <ian.d.romanick@intel.com>
2009-06-23i965: Fix depth-texture Y-tiling detection for sized internal formats.Eric Anholt
Fixes assertion failure on norsetto shadow mapping demo.
2009-06-23i965: Fix packed depth/stencil textures to be Y-tiled as well.Eric Anholt
Fixes shadowtex.c. And an assert is added to catch this sooner next time.
2009-06-23intel: Bail on blits with non-tile-aligned offsets.Eric Anholt
2009-06-23intel: Avoid trying to do blits to Y tiled regions.Eric Anholt
This is somewhat nasty, but we need to do Y-tiled depth for FBO support. May help with corruption and hangs since enabling texture tiling, and since switching depth textures to Y tiled. Fixes piglit depthtex.c on 965.
2009-06-23intel: Fix some potential writes to zero-copy PBOs when used as regions.Eric Anholt
I was in the midst of fixing some blitting-with-Y-tiled issues when I noticed this. Hopefully PBO usage will be a little more robust, as a result.
2009-06-23intel: Remove long-unused intel_region_fill and intelEmitFillBlit.Eric Anholt
2009-06-23intel: Refuse to do texture tiling if we don't have the kernel support.Eric Anholt
2009-06-23Fix crash when debug output is enabled and sarea is notset in r200ClearPauli Nieminen
2009-06-22mesa: From float type modifier from values to large for singlesIan Romanick
The values 2147483648.0 and 4294967294.0 are too larget to be stored in single precision floats. Forcing these to be singles causes bits to be lost, which results in errors in some pixel transfer tests. This fixes bug #22344.
2009-06-22st/mesa: fix setup_edgeflags() regressionBrian Paul
stobj is now non-null for the default/null buffer object. Update the test to check the buffer ID to see if it's a real buffer object.
2009-06-22i965: handle OPCODE_SWZ in the glsl pathRoland Scheidegger
glsl compiler will not generate OPCODE_SWZ, and as a first step it would be translated away to a MOV anyway (why?), but later internally this opcode is generated (for EXT_texture_swizzling). (cherry picked from commit 4ef1f8e3b52a06fcf58f78c9c36738531b91dbac)
2009-06-22Disable SGI_swap_control extension for DRI2Owen W. Taylor
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 (cherry picked from commit 279143c6e808b37c333321b696d80df77f709a04)
2009-06-22intel: intel_texture_drawpixels() can't handle GL_DEPTH_STENCIL.Michel Dänzer
Fixes glean depthStencil test. (cherry picked from commit 3885b708fdbb7bbd5dd3a247c41fb9a75ee7c057)
2009-06-22i965: added intelFlush() call in intel_get_tex_image()Brian Paul
Fixes the render-to-texture test in progs/tests/getteximage.c (cherry picked from commit a03b349153660e449daf4f56d750f1caef23b1a5)
2009-06-22mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcsBrian Paul
(cherry picked from commit 4dc426c01627a240bd5b148c1804c45b0d5ecd6c)
2009-06-22mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBSBrian Paul
Be clearer that this is the number of generic vertex program/shader attributes, not counting the legacy attributes (pos, normal, color, etc). (cherry picked from commit 4a95185c9f30c2de7a03bb1a0653f51b53b1111d)
2009-06-22mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTSBrian Paul
(cherry picked from commit d2a74d76c96957cf0294dcf40d29526621ada95e)
2009-06-22mesa: fix some potential state-restore issues in pop_texture_group()Brian Paul
Call the _mesa_set_enable() functions instead of driver functions, etc. Also, add missing code for 1D/2D texture arrays. (cherry picked from commit aac19609bfd7c950b2577489b06886c8a8097bb2)
2009-06-22vbo: return VP_NONE from get_program_mode() if running fixed-func vertex programBrian Paul
If we're running a vertex program to emulated fixed-function, we still need to treat vertex arrays/attributes as if we're in fixed-function mode. This should probably be back-ported to Mesa 7.5 after a bit more testing. (cherry picked from commit dda82137d28aba846dda73da230871c115e30aaf)
2009-06-22mesa: create/use a fallback texture when bound texture is incompleteBrian Paul
When a GLSL sampler reads from an incomplete texture it should return (0,0,0,1). Instead of jumping through hoops in all the drivers to make this happen, just create/install a fallback texture with those texel values. Fixes piglit/fp-incomplete-tex on i965 and more importantly, fixes some GPU lockups when trying to sample from missing surfaces. If a binding table entry is NULL, it seems that sampling sometimes works, but not always (lockup). Todo: create a fallback texture for each type of texture target? (cherry picked from commit 3f25219c7bf0f090502489928f0f018e62c4f6cf)
2009-06-22gallium-intel: Improve Xorg Makefile a bitJakob Bornecrantz
The real solution is to create a Makefile.template for xorg drivers and use that here.
2009-06-22st/xorg: Convert to template makefileJakob Bornecrantz
2009-06-22st/dri: Fix typo when checking for depth formatsJakob Bornecrantz
2009-06-22i965: Fix warnings in intel_pixel_read.c.Eric Anholt
2009-06-22intel: Fix glReadPixels regression since changing context init order.Michel Dänzer
Fixes regression in dd26899ca39111e0866afed9df94bfb1618dd363 that also affected some PBO operations.
2009-06-19intel: Also get the DRI2 front buffer when doing front buffer reading.Eric Anholt
2009-06-19intel: Update Mesa state before span setup in glReadPixels.Eric Anholt
We could have mapped the wrong set of draw buffers. Noticed while looking into a DRI2 glean ReadPixels issue.
2009-06-19intel: Move intel_pixel_read.c to shared for use with i965.Eric Anholt
2009-06-19intel: Don't map regions with drm_intel_gem_bo_map_gtt() unless they're tiled.Eric Anholt
This fixes a regression in region read performance that came in with the texture tiling changes. Ideally we'd have an access flag coming in so we could also use bo_map_gtt for writing, like we do for buffer objects. Bug #22190
2009-06-19intel: Fix other metaops versus GL_COMPILE_AND_EXECUTE dlists.Eric Anholt
Fixes oglconform zbfunc.c and pxtrans-cidraw.c, at least. (cherry picked from commit 405300bb190f516e16b704050abe3389b366ed27)
2009-06-19intel: Fix glClear behavior versus display lists.Eric Anholt
The CALL_DrawArrays was leaking the clear's primitives into the display list with GL_COMPILE_AND_EXECUTE. Use _mesa_DrawArrays instead, which doesn't appear to leak. Fixes piglit dlist-clear test. (cherry picked from commit 64edde1004f7a69e77877bba24d315a92bcd47c8)
2009-06-19intel: Fix other metaops versus GL_COMPILE_AND_EXECUTE dlists.Eric Anholt
Fixes oglconform zbfunc.c and pxtrans-cidraw.c, at least.
2009-06-19intel: Fix glClear behavior versus display lists.Eric Anholt
The CALL_DrawArrays was leaking the clear's primitives into the display list with GL_COMPILE_AND_EXECUTE. Use _mesa_DrawArrays instead, which doesn't appear to leak. Fixes piglit dlist-clear test.
2009-06-19mesa: Make VBO dlist printing use the same path as other dlist printing.Eric Anholt
I was rather confused when mesa_print_display_list didn't show any of my glBegin()..glEnd(). Nothing but print_list appears to call this function, so matching its behavior seems like a good idea.
2009-06-19intel: Do not access pbo's buffer directly when attaching.Chia-I Wu
pbo might be system buffer based or attached to another region. Call intel_bufferobj_buffer to make sure pbo has a buffer of its own. Signed-off-by: Chia-I Wu <olvaffe@gmail.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2009-06-19intel: Data are copied in the wrong direction when breaking COW tie.Chia-I Wu
Signed-off-by: Chia-I Wu <olvaffe@gmail.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2009-06-19intel: Fix migration from sys_buffer in intel_bufferobj_buffer.Chia-I Wu
intel_bufferobj_subdata is called to migrate data from sys_buffer, and it expects only one of buffer or sys_buffer is non-NULL. Signed-off-by: Chia-I Wu <olvaffe@gmail.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2009-06-20radeon: make cubemap mipmap generation workRoland Scheidegger
need to pass target parameter to radeon_teximage/radeon_subteximage functions otherwise mipmap generation for cube maps can't work (assert/segfault in _mesa_generate_mipmap)
2009-06-19intel: Fixups for 'mesa: create/destroy buffer objects via driver functions'.Michel Dänzer
Initialize all driver function hooks before calling _mesa_initialize_context(), and handle all buffer objects in intel_buffer_object(). Fixes assertion failure when running glxinfo.
2009-06-19radeon: fix cube maps for non-mm pathRoland Scheidegger
drm cmd checker would refuse cube emits also fix an issue in the cs path which would calculate the register offset off by one dword. Only same testing done as original code (none except compile tested).
2009-06-19st/mesa: restore some parameter checking buffer object functionsBrian Paul
These functions may be called from the VBO code (not just user GL calls) so do some parameter sanity checking.
2009-06-19r200: fix cube maps for non-mm pathRoland Scheidegger
drm cmd checker rightfully fell over any cube emit