summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel
AgeCommit message (Collapse)Author
2009-10-05Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/gallium/auxiliary/util/u_cpu_detect.c
2009-10-05intel: use driReadDrawable in do_copy_texsubimage()Brian Paul
2009-10-05intel: use driReadDrawable, not driDrawable in do_blit_readpixels()Brian Paul
2009-10-05intel: remove a buffer equality test in _mesa_make_current()Brian Paul
Before, if we called glXMakeCurrent() to change a context's window binding while an FBO was bound, we weren't updating the intel->driDrawable and intel->driReadDrawable fields. This could cause us to dereference a null pointer elsewhere.
2009-10-03intel: Suppress a compiler warning for an pointer->int castChris Wilson
intel_pixel_read.c: In function ‘do_blit_readpixels’: intel_pixel_read.c:221: warning: cast from pointer to integer of different size Cast via an intermediate (GLintptr) instead and hope the result fits within GLuint... [It should as we simply do not support textures *that* large!] Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-10-03intel: Assert that relocation offsets are within the targetChris Wilson
This should catch the common programming error where we attempt to emit a relocation to beyond the end of the target buffer. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2009-10-02intel: Remove an unexplained flush from intelClearWithBlit.Eric Anholt
2009-10-02intel: wrap _mesa_meta_GenerateMipmap()Brian Paul
Need to check if we'll take the software path so which requires mapping the src texture image. Fixes crash in piglit gen-compressed-teximage, bug 24219. However, the test still does not pass (it may never have).
2009-10-01i915: Add stub ARB_occlusion_query support under a driconf debug option.Eric Anholt
This is useful for enabling our GLSL testcases using the 2.0 entrypoints even though we don't have full GL 2.0.
2009-10-01i915: Add optional support for ARB_fragment_shader under a driconf option.Eric Anholt
Other vendors have enabled ARB_fragment_shader as part of OpenGL 2.0 enablement even on hardware like the 915 with no dynamic branching or dFdx/dFdy support. But for now we'll leave it disabled because we don't do any flattening of ifs or loops, which is rather restrictive. This support is not complete, and may be unstable depending on your shaders. It passes 10/15 of the piglit glsl tests, but hangs on glean glsl1.
2009-10-01i915: Enable ARB_vertex_shader for both i915 and i830.Eric Anholt
Since the TNL is all done in software anyway, it should be the same to the user who's probably using ARB_vertex_program otherwise, but gives them a nicer programming environment.
2009-10-01Merge branch 'mesa_7_6_branch'Brian Paul
2009-09-30i965: Fix massive memory allocation for streaming texture usage.Eric Anholt
Once we've freed a miptree, we won't see any more state cache requests that would hit the things that pointed at it until we've let the miptree get released back into the BO cache to be reused. By leaving those surface state and binding table pointers that pointed at it around, we would end up with up to (500 * texture size) in memory uselessly consumed by the state cache. Bug #20057 Bug #23530
2009-09-28intel: Drop my generatemipmap code in favor of the new shared code.Eric Anholt
2009-09-28intel: Remove some dead metaops code.Eric Anholt
2009-09-28Merge branch 'mesa_7_6_branch'Brian Paul
2009-09-28Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul
2009-09-25intel: Handle GL_RGB8 for glCopyTex(Sub)Image.Michel Dänzer
Avoids an unnecessary fallback.
2009-09-25Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/mesa/drivers/dri/intel/intel_clear.c
2009-09-24i915: Fix GetBufferSubData in the case of a system-memory BO.Eric Anholt
Bug #23760 (crashes in wine)
2009-09-24intel: Flush the batch when we're about to subdata into a VBO.Eric Anholt
This fixes the clears in openarena with the new metaops clear code, and the new piglit vbo-subdata-sync test. Bug #23857.
2009-09-24Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/mesa/vbo/vbo_exec_array.c
2009-09-24intel: use default array/element buffers in intel_generate_mipmap()Brian Paul
If there happened to be a bound VBO when intel_generate_mipmap() was called we blew up because of a bad vertex array pointer. Fixes regnumonline, bug 23859.
2009-09-21intel: Mark the FBO as incomplete if there's no intel_renderbuffer for it.Eric Anholt
This happens to rendering with textures with a border, which had resulted in a segfault on dereferencing the irb. (cherry-picked from commit 8bba183b9eeb162661a287bf2e118c6dd419dd24)
2009-09-21Merge branch 'mesa_7_6_branch'Michel Dänzer
2009-09-21Merge branch 'mesa_7_5_branch' into mesa_7_6_branchMichel Dänzer
2009-09-21intel: Fix crash in intel_flush().Michel Dänzer
Since commit 2921a2555d0a76fa649b23c31e3264bbc78b2ff5 ('intel: Deassociated drawables from private context struct in intelUnbindContext'), intel->driDrawable may be NULL in intel_flush().
2009-09-20Revert "mesa: move _mesa_meta_init/free() calls to core Mesa"Brian Paul
This reverts commit 651cffd626a82d9bf539437ca4bdf8ea4b396fab. The commit inadvertantly introduced a new gallium dependency on the meta code.
2009-09-20intel: meta clear has a new name.Chia-I Wu
It was renamed to _mesa_meta_Clear. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-20Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/mesa/drivers/dri/intel/intel_clear.c
2009-09-19mesa: rename functions to be more consistant with rest of mesaBrian Paul
2009-09-19mesa: move _mesa_meta_init/free() calls to core MesaBrian Paul
2009-09-19intel: use new _mesa_meta_CopyTex[Sub]Image() functionsBrian Paul
2009-09-18[i965] add a missing header fileZou Nan hai
2009-09-18 [i965] use intel_batchbuffer_flush to flush the clearZou Nan hai
2009-09-16Merge branch 'mesa_7_6_branch'Ian Romanick
2009-09-16Merge branch 'mesa_7_5_branch' into mesa_7_6_branchIan Romanick
Conflicts: src/mesa/main/dlist.c
2009-09-16intel: Deassociated drawables from private context struct in intelUnbindContextIan Romanick
The generic DRI infrastructure makes sure that __DRIcontextRec::driDrawablePriv and __DRIcontextRec::driReadablePriv are set to NULL after unbinding a context. However, the intel_context structure keeps cached copies of these pointers. If these cached pointers are not NULLed and the drawable is actually destroyed after unbinding the context (typically by way of glXDestroyWindow), freed memory will be dereferenced in intelDestroyContext. This should fix bug #23418.
2009-09-16i965: do a flush in clear, fix openarena render issue,Zou Nan hai
fd.o bug# 23857
2009-09-15mesa: move generate mipmap callsBrian Paul
Per the suggestion in the Intel driver, move the calls to ctx->Driver.GenerateMipmap() into core Mesa so that drivers don't have to worry about it.
2009-09-14intel: minor code clean-upsBrian Paul
2009-09-14intel: fix renderbuffer map/unmap regressionBrian Paul
Commit 36dd53a3cded9d003ec418732b7fc93c1476aa9b caused a few regressions because the glReadBuffer() buffer wasn't getting mapped when GL_READ_BUFFER != GL_DRAW_BUFFER.
2009-09-14intel: remove unneeded driver function assignmentsBrian Paul
These default swrast functions are already installed by _mesa_init_driver_functions().
2009-09-10Merge branch 'mesa_7_6_branch'Brian Paul
2009-09-10intel: disable intel_stencil_drawpixels() for nowBrian Paul
It doesn't work reliably even when all the prerequisite checks are made.
2009-09-10Fix merge failIan Romanick
One of the conflicst from this merge was missed: commit 0c309bb494b6ee1c403442d1207743f749f95b6e Merge: c6c44bf d27d659 Author: Brian Paul <brianp@vmware.com> Date: Wed Sep 9 08:33:39 2009 -0600
2009-09-10Merge branch 'mesa_7_5_branch' into mesa_7_6_branchIan Romanick
Conflicts: src/mesa/drivers/dri/intel/intel_context.c
2009-09-10intel: add B43 chipset supportZhenyu Wang
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Hopefully this will be one of the last cherry-picks. (cherry picked from commit ca246dd186f9590f6d67038832faceb522138c20)
2009-09-10intel: Don't forget to map the depth read buffer in spans.Eric Anholt
This broke BlitFramebufferEXT(GL_DEPTH_BUFFER_BIT).
2009-09-09i965: fix an overlooked merge conflictBrian Paul