summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
AgeCommit message (Collapse)Author
2009-10-28Merge branch 'texformat-rework'Brian Paul
Conflicts: src/mesa/drivers/dri/radeon/radeon_fbo.c src/mesa/drivers/dri/s3v/s3v_tex.c src/mesa/drivers/dri/s3v/s3v_xmesa.c src/mesa/drivers/dri/trident/trident_context.c src/mesa/main/debug.c src/mesa/main/mipmap.c src/mesa/main/texformat.c src/mesa/main/texgetimage.c
2009-10-28Merge branch 'mesa_7_6_branch'Brian Paul
2009-10-28r600: add occlusion query supportAlex Deucher
Based on initial patch from Stephan Schmid <stephan_2303@gmx.de>. Basic idea is to dump the zpass count at the start and end of the query and subtract to get the total number of visible fragments. HW writes alternating qwords for up to 4 DBs. On the first pass, we start at buffer address + 0; on the second pass, we start at buffer address + 8 (bytes). The resulting buffer at the end of the query looks like: qw[0]: db0 start qw[1]: db0 end ... qw[6]: db3 start qw[7]: db3 end The MSB of each qword is the valid bit and the lower 63 bits are the zpass count for that DB. OQ on RV740 is disabled at the moment as it only seems to report results for half of its DBs. This needs further investigation. Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-10-28intel: Fix memory leak in case of renderbuffer bad formatVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-28Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_lexer.l
2009-10-28intel: Fix memory leak in event of mip tree allocation failureVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-27intel: Fix flipped condition in ARB_sync GetSYnciv(GL_SYNC_STATUS).Eric Anholt
Bug #24435 (cherry picked from commit d56125a298106d81e10674f1c4b3b43b51a5139d)
2009-10-27intel: added region draw_x/y offsets in x/y_tile_swizzle() funcsBrian Paul
This fixes the second part of bug 23552.
2009-10-27radeon: add case for MESA_FORMAT_X8_Z24 in radeon_create_renderbuffer()Brian Paul
2009-10-27intel: silence warningBrian Paul
2009-10-27via: silence unused var warningsBrian Paul
2009-10-27intel: minor clean-up, commentsBrian Paul
2009-10-27intel: use _mesa_get_current_tex_unit() helperBrian Paul
2009-10-27intel: fix comment, formattingBrian Paul
2009-10-27intel: fix src offset bug in do_copy_texsubimage()Brian Paul
Use src->draw_offset intead of zero. Zero usually worked, except when the src renderbuffer is actually a texture mipmap level higher than zero. Fixes progs/test/blitfb.c test.
2009-10-27i915: Fix driver for the miptree x/y offset changes.Eric Anholt
Bug #24734.
2009-10-27i965: be clear that the Fallback field is a boolean, not a bitfieldBrian Paul
2009-10-27Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"Brian Paul
This reverts commit 8810b8f67135185d1044746bb861fe2ff997626c. It turns out the i965 driver uses the intel->Fallback field as a boolean, not as a bitmask. The intelFallback() function is a no-op in the i965 driver. It would have been nice if there were some comments about this. I'll fix that next...
2009-10-27intel: fix GL state bugs in intel_texture_bitmap()Brian Paul
Need to push texture state and polygon state too. Fixes rendering glitches seen in progs/demos/engine when changing the rendering mode (wireframe, texture modes). This makes bitmap rendering a little slower, unfortunately.
2009-10-27intel: fix src offset bug in do_copy_texsubimage()Brian Paul
Use src->draw_offset intead of zero. Zero usually worked, except when the src renderbuffer is actually a texture mipmap level higher than zero. Fixes progs/test/blitfb.c test.
2009-10-27i915: Fix driver for the miptree x/y offset changes.Eric Anholt
Bug #24734.
2009-10-27i965: be clear that the Fallback field is a boolean, not a bitfieldBrian Paul
2009-10-27Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"Brian Paul
This reverts commit 8810b8f67135185d1044746bb861fe2ff997626c. It turns out the i965 driver uses the intel->Fallback field as a boolean, not as a bitmask. The intelFallback() function is a no-op in the i965 driver. It would have been nice if there were some comments about this. I'll fix that next...
2009-10-26intel: fix GL state bugs in intel_texture_bitmap()Brian Paul
Need to push texture state and polygon state too. Fixes rendering glitches seen in progs/demos/engine when changing the rendering mode (wireframe, texture modes). This makes bitmap rendering a little slower, unfortunately.
2009-10-25mesa: choose texture format in core mesa, not driversBrian Paul
Call the ctx->Driver.ChooseTextureFormat() function from core Mesa's _mesa_[Copy]TexImage functions instead of in the driver functions. One less thing for drivers to do.
2009-10-25mesa: remove calls to _mesa_compressed_row_stride()Brian Paul
2009-10-24mesa: remove _mesa_compressed_texture_size()Brian Paul
Use _mesa_format_image_size() instead.
2009-10-24mesa: change compressed texture size callsBrian Paul
Replace calls to ctx->Driver.CompressedTextureSize with calls to _mesa_format_image_size. The former always called the later.
2009-10-23Merge remote branch 'origin/mesa_7_6_branch'Eric Anholt
Conflicts: src/mesa/drivers/dri/intel/intel_fbo.c src/mesa/drivers/dri/intel/intel_mipmap_tree.c src/mesa/drivers/dri/intel/intel_mipmap_tree.h src/mesa/drivers/dri/intel/intel_tex_copy.c src/mesa/drivers/dri/intel/intel_tex_image.c
2009-10-23i965: Annotate _NEW_COLOR dependency for brw_update_renderbuffer_surface().Eric Anholt
2009-10-23intel: Keep track of x,y offsets in miptrees and use them for blitting.Eric Anholt
By just using offsets, we confused the hardware's tiling calculations, resulting in failures in miptree validation and blit clears. Fixes piglit fbo-clearmipmap. Bug #23552. (automatic mipmap generation)
2009-10-23mesa/dri: Remove extension_helper.h.Chia-I Wu
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-23mesa: Enable remap table in core.Chia-I Wu
This enables the remap table in core. driInitExtensions is adapted to use the remap table. All uses of extension_helper.h are replaced by remap_helper.h. The chicken-egg problem of the DRI drivers is also solved. It is now also possible to pass NULL extensions to driInitExtensions. It will cause driInitExtensions to map all known functions. This functionality is used by software drivers and EGL_i915. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-23r600: remove duplicate stride settingAndre Maasikas
Stride is set already in r700SetVertexFormat and there it works correctly for 0 also
2009-10-23r600: for position invariant programs reading vert_pos is not always known ↵Andre Maasikas
at this point
2009-10-23r600: remove remains of old tnl pipelineAlex Deucher
2009-10-23r600: fix render size predictionAlex Deucher
2009-10-23r600: remove old tnl pipelineAlex Deucher
2009-10-23r600: clean up context creationAlex Deucher
Make it more consistent with other radeon drivers.
2009-10-22dri/drivers: update driNewRenderbuffer() to take a gl_formatBrian Paul
Now pass a specific MESA_FORMAT_x token to indicate the renderbuffer's format. This is better than passing a GLenum and having to guess the specific format. I'm unable to test all the drivers, but any issues should be easy to fix.
2009-10-22radeon: simplify radeon_create_renderbuffer()Brian Paul
2009-10-22Merge branch 'mesa_7_6_branch'Brian Paul
2009-10-22intel: flush old context before binding new contextBrian Paul
Per the GLX spec, when changing rendering contexts, the old context should first be flushed.
2009-10-22i965: fix hacked Fallback usage in brw_prepare_vertices()Brian Paul
Setting intel->Fallback = 1 clobbered any fallback state that was already set. Not sure where this hack originated (the git history is a little convoluted). Define and use a new BRW_FALLBACK_DRAW bit instead. This shouldn't break anything and could potentially fix some bugs (but no specific ones are known).
2009-10-22intel: define INTEL_FALLBACK_DRIVER for driversBrian Paul
2009-10-22intel: Fallback field is a bitmask, use GLbitfieldBrian Paul
2009-10-22i965: remove unused brw_context::tmp_fallback fieldBrian Paul
2009-10-22i965: remove unused BRW_FALLBACK_TEXTURE bitBrian Paul
The value was probably wrong too. It was the same as INTEL_FALLBACK_DRAW_BUFFER.
2009-10-22Kill off trident.Corbin Simpson
Hm. I could have said "chew trident and spit it out," or perhaps "spear trident," instead. Dohoho.
2009-10-22Nuke s3v.Corbin Simpson
As per FDO #17889.