Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | gallium: change remaining util functions to use cso sampler views | Roland Scheidegger | 2010-03-16 | 2 | -8/+21 |
| | | | | | changes arguments of util_blit_pixels_tex and util_gen_mipmap to struct pipe_sampler_view * instead of struct pipe_texture *. | ||||
* | Merge commit 'origin/master' into gallium-sampler-view | Keith Whitwell | 2010-03-16 | 10 | -9/+881 |
|\ | | | | | | | | | | | | | This branch already seems to have the nv50_tex.c fix. Conflicts: src/gallium/drivers/nv50/nv50_tex.c | ||||
| * | Merge remote branch 'origin/gallium-st-api' | Chia-I Wu | 2010-03-16 | 10 | -9/+881 |
| |\ | |||||
| | * | st/mesa: Update the comments in st_manager.c. | Chia-I Wu | 2010-03-15 | 1 | -4/+7 |
| | | | |||||
| | * | st/mesa: Fix handling of FBO. | Chia-I Wu | 2010-03-14 | 1 | -16/+24 |
| | | | | | | | | | | | | | | | FBOs are created by st_new_framebuffer and cannot be casted to st_framebuffer. | ||||
| | * | st/mesa: Validate the state in st_readpixels. | Chia-I Wu | 2010-03-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | The front renderbuffer of a framebuffer is usually added as needed when glReadBuffer(GL_FRONT) is called. When the call is followed by glReadPixels, we should validate the state before reading from the renderbuffer. | ||||
| | * | st/mesa: Set revalidate in st_framebuffer_update_attachments. | Chia-I Wu | 2010-03-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | There are two conditions that a validation is required. One is when the the framebuffer becomes invalid. The other is when we request for textures that we did not request before. | ||||
| | * | st/mesa: Check the format before adding depth/stencil buffers. | Chia-I Wu | 2010-03-12 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | The format might have depth bits, stencil bits, or both. Add the renderbuffers as needed. | ||||
| | * | st/mesa: Implement st_api.h. | Chia-I Wu | 2010-03-12 | 9 | -9/+860 |
| | | | | | | | | | | | | | | | | | | | | | | | | There is currently no user of this new interface. As the inteface can coexist with st_public.h, everthing should work as before. ST_TEXTURE_2D is both defined by st_public.h and st_api.h. Reorder the headers in st/dri to avoid conflicts. | ||||
* | | | st/mesa: Fix a call to st_get_stobj_sampler_view(). | Michal Krol | 2010-03-15 | 1 | -1/+1 |
| | | | |||||
* | | | st/mesa: Pass in correct sampler view object to blitter. | Michal Krol | 2010-03-15 | 1 | -1/+1 |
| | | | |||||
* | | | gallium: util_blit_pixels() takes source sampler view as argument. | Michal Krol | 2010-03-15 | 2 | -5/+12 |
| | | | |||||
* | | | st/mesa: Cache FBO texture's sampler view object. | Michal Krol | 2010-03-15 | 4 | -0/+31 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-sampler-view | Keith Whitwell | 2010-03-15 | 22 | -321/+882 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/nv30/nv30_context.h src/gallium/drivers/nv30/nv30_state.c src/gallium/drivers/nv40/nv40_context.h src/gallium/drivers/nv40/nv40_state.c src/gallium/drivers/r300/r300_emit.c | ||||
| * | | dri/common: mv __driUtilMessage to utils.c | George Sapountzis | 2010-03-15 | 6 | -31/+29 |
| | | | | | | | | | | | | allows to link with xmlconfig without dri_util, and has nothing drm-specific. | ||||
| * | | dri/swrast: add comment in case it's not clear | George Sapountzis | 2010-03-15 | 1 | -2/+2 |
| | | | |||||
| * | | dri/swrast: drop mtypes.h from dri_sw | George Sapountzis | 2010-03-15 | 1 | -1/+1 |
| | | | |||||
| * | | dri/swrast: update copyright email | George Sapountzis | 2010-03-15 | 3 | -11/+3 |
| | | | |||||
| * | | dri/swrast: port to dri_sw (drawable) | George Sapountzis | 2010-03-15 | 4 | -22/+60 |
| | | | |||||
| * | | dri/swrast: port to dri_sw (context) | George Sapountzis | 2010-03-15 | 5 | -22/+58 |
| | | | |||||
| * | | dri/swrast: port to dri_sw | George Sapountzis | 2010-03-15 | 3 | -180/+100 |
| | | | |||||
| * | | dri: add dri_sw.c helper | George Sapountzis | 2010-03-15 | 2 | -0/+382 |
| | | | | | | | | | | | | | | | This is dri_util.c stripped from the drm-specific bits and will be used for both classic and gallium swrast_dri.so | ||||
| * | | glapi: exec_malloc for dispatch stubs | George Sapountzis | 2010-03-14 | 6 | -8/+156 |
| | | | |||||
| * | | glapi: this one should be by THREAD | George Sapountzis | 2010-03-14 | 1 | -6/+4 |
| | | | |||||
| * | | glapi: more organize code by arch | George Sapountzis | 2010-03-14 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | It seems that x86-64 with tls will fail to compile or load due to a missining gl_dispatch_functions_start symbol. Not changing though, since this is how it used to be and cannot test. | ||||
| * | | glapi: organize arch-specific code by arch (2) | George Sapountzis | 2010-03-14 | 1 | -81/+73 |
| | | | |||||
| * | | glapi: organize arch-specific code by arch | George Sapountzis | 2010-03-14 | 1 | -19/+50 |
| | | | |||||
| * | | radeon: add some debuging info for glCopyTex(Sub)Image | Maciej Cencora | 2010-03-13 | 1 | -1/+7 |
| | | | |||||
| * | | r300: blits for small dst pitch work just fine | Maciej Cencora | 2010-03-13 | 1 | -6/+0 |
| | | | |||||
| * | | radeon: fix gl format to mesa format mapping and add GL_BGRA formats | Maciej Cencora | 2010-03-13 | 1 | -7/+18 |
| | | | |||||
| * | | radeon: fix glCopyTex(Sub)Image | Maciej Cencora | 2010-03-13 | 1 | -2/+11 |
| | | | | | | | | | | | | Fallback to swrast for software renderbuffers | ||||
* | | | Merge commit 'origin/master' into gallium-sampler-view | Keith Whitwell | 2010-03-13 | 74 | -1024/+1006 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_tile.c src/gallium/auxiliary/util/u_tile.h src/gallium/drivers/identity/id_context.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_setup.h src/gallium/drivers/softpipe/sp_tex_tile_cache.c src/gallium/include/pipe/p_context.h src/mesa/state_tracker/st_cb_bitmap.c src/mesa/state_tracker/st_cb_drawpixels.c | ||||
| * | | Revert "st/mesa: Always recalculate invalid index bounds." | Corbin Simpson | 2010-03-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | This reverts commit 50876ddaaff72a324ac45e255985e0f84e108594. Per ML discussion. | ||||
| * | | i965: Clarify the roles of emit_pixel_xy(), emit_delta_xy(), emit_wpos_xy(). | Eric Anholt | 2010-03-12 | 1 | -7/+19 |
| | | | |||||
| * | | i965: Clarify that DELTAXY always occurs for both X and Y. | Eric Anholt | 2010-03-12 | 1 | -14/+13 |
| | | | |||||
| * | | i965: Do FS SLT, SGT, and friends using CMP, SEL instead of CMP, MOV, MOV. | Eric Anholt | 2010-03-12 | 1 | -5/+2 |
| | | | |||||
| * | | i965: Do VS SGT, SLT, and friends using CMP, SEL instead of CMP, MOV, MOV. | Eric Anholt | 2010-03-12 | 1 | -3/+2 |
| | | | |||||
| * | | i965: Fix up VS DP4 sequences to avoid dependency control. | Eric Anholt | 2010-03-12 | 4 | -0/+123 |
| | | | | | | | | | | | | | | | This is recommended by the B-Spec. I wasn't able to measure any difference in ETQW. | ||||
| * | | i965: When doing a swizzled kill pixel, don't do redundant channel compares. | Eric Anholt | 2010-03-12 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | This was obvious when looking at the compiled output of ETQW's shaders. | ||||
| * | | i965: Use the SEL instruction to implement MIN and MAX. | Eric Anholt | 2010-03-12 | 1 | -11/+3 |
| | | | | | | | | | | | | Saves an instruction over doing conditional moves. | ||||
| * | | Merge branch '7.8' | Michel Dänzer | 2010-03-12 | 21 | -87/+49 |
| |\ \ | |||||
| | * | | dri/r700: include shader/programopt.h instead of programopt.c. | Luc Verhaegen | 2010-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <brianp@vmware.com> | ||||
| | * | | Grammar and spelling fixes | Jeff Smith | 2010-03-12 | 16 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Brian Paul <brianp@vmware.com> | ||||
| | * | | radeon: Fix memory leaks from early return. | Vinson Lee | 2010-03-11 | 1 | -0/+2 |
| | | | | |||||
| | * | | st/mesa: s/BUFFER_FRONT_LEFT/surfIndex/ | Brian Paul | 2010-03-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | st/mesa: fix st_set_framebuffer_surface() state validation | Brian Paul | 2010-03-11 | 1 | -38/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the _NEW_BUFFERS flag and remove the code which updated the parent framebuffer size. Normal Mesa state validation will do that. Fixes issues with Warsow on r300g and possibly other bugs. | ||||
| | * | | ARB prog parser: added (float) casts and regenerate files | Brian Paul | 2010-03-11 | 2 | -30/+16 |
| | | | | |||||
| * | | | r100/r200/r300/r300: only enable accelerated pixel ops with kms | Alex Deucher | 2010-03-12 | 10 | -22/+30 |
| | | | | | | | | | | | | | | | | fixes fdo bug 27043 | ||||
| * | | | gallium: fix BGRA vertex color swizzles | Marek Olšák | 2010-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mapping for vertex_array_bgra: (gl -> st -> translate) GL_RGBA -> PIPE_FORMAT_R8G8B8A8 (RGBA) -> no swizzle (XYZW) GL_BGRA -> PIPE_FORMAT_A8R8G8B8 (ARGB) -> ZYXW (BGRA again??) Iẗ́'s pretty clear that PIPE_FORMAT_A8R8G8B8 here is wrong. This commit fixes the pipe format and removes obvious workarounds in util/translate. Tested with: softpipe, llvmpipe, r300g. Signed-off-by: José Fonseca <jfonseca@vmware.com> | ||||
| * | | | st/mesa: Always recalculate invalid index bounds. | Corbin Simpson | 2010-03-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should always be sanitized before heading towards the pipe driver, and if the calling function explicitly marked them as invalid, we need to regenerate them. Allows r300g to properly pass a bit more of Wine's d3d9 testing without dropping stuff on the floor. |