summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'width0'Roland Scheidegger2009-11-278-50/+58
|\ | | | | | | | | | | | | Conflicts: src/gallium/drivers/r300/r300_texture.c src/gallium/state_trackers/xorg/xorg_exa.c src/mesa/state_tracker/st_cb_texture.c
| * gallium: fix more statetrackers/drivers for not using texture ↵Roland Scheidegger2009-11-261-1/+1
| | | | | | | | width/height/depth arrays
| * gallium: don't use arrays for texture width,height,depthKeith Whitwell2009-11-198-49/+57
| |
* | Merge commit 'origin/st-shader-varients'Roland Scheidegger2009-11-2614-651/+327
|\ \ | | | | | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_atom_shader.c src/mesa/state_tracker/st_program.c
| * | mesa/st: refactor vertex and fragment shader translationKeith Whitwell2009-11-1512-469/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate vertex shaders independently of fragment shaders. Previously tried to make fragment shader semantic indexes always start at zero and exclude holes. This was unnecessary but meant that vertex shader translation had to be adjusted to take this into account. Now use a fixed scheme for labelling special FS input semantics (color, etc), and another fixed scheme for the generics. With this, vertex shaders can be translated independently of the bound fragment shader, assuming mesa has done its own job and ensured that the vertex shader provides at least the inputs the fragment shader is looking for. The state-tracker didn't attempt to do anything about this previously, so it shouldn't be needed now.
| * | mesa/st: emit tgsi vertex shader directly for drawpixelsKeith Whitwell2009-11-151-77/+47
| | | | | | | | | | | | | | | | | | | | | One of several cases where we build mesa shaders and then translate them to tgsi. Many of those cases it's because we're combining two mesa programs and there are helpers for that, but in this case at least can go straight to tgsi.
| * | mesa/st: don't calculate unused output_flags data eitherKeith Whitwell2009-11-153-24/+4
| | |
| * | mesa/st: don't calculate unused input_flags dataKeith Whitwell2009-11-153-16/+2
| | |
| * | mesa/st: don't calculate unused vs input semantic tagsKeith Whitwell2009-11-151-69/+2
| | |
* | | st/mesa: replace st_flush() with pipe->flush()Brian Paul2009-11-191-1/+1
| | | | | | | | | | | | | | | We only need to flush the gallium driver in this case. Fixes a recursive state validation bug.
* | | st/mesa: get rid of compressed_num_bytes() codeBrian Paul2009-11-191-36/+4
| | |
* | | st/mesa: remove is_compressed_mesa_format()Brian Paul2009-11-191-21/+2
| | |
* | | st/mesa: remove pointless assertionBrian Paul2009-11-191-2/+0
| | |
* | | Merge branch 'outputswritten64'Ian Romanick2009-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a GLbitfield64 type and several macros to operate on 64-bit fields. The OutputsWritten field of gl_program is changed to use that type. This results in a fair amount of fallout in drivers that use programs. No changes are strictly necessary at this point as all bits used are below the 32-bit boundary. Fairly soon several bits will be added for clip distances written by a vertex shader. This will cause several bits used for varyings to be pushed above the 32-bit boundary. This will affect any drivers that support GLSL. At this point, only the i965 driver has been modified to support this eventuality. I did this as a "squash" merge. There were several places through the outputswritten64 branch where things were broken. I foresee this causing difficulties later for bisecting. The history is still available in the branch. Conflicts: src/mesa/drivers/dri/i965/brw_wm.h
* | | mesa: fix assorted compiler warningsBrian Paul2009-11-173-7/+7
| |/ |/|
* | st/mesa: comments for st_draw.cBrian Paul2009-11-151-4/+14
|/
* mesa: Export S3_s3tc as well.José Fonseca2009-11-061-0/+1
| | | | Used in Quake3.
* mesa: Translate MAP_UNSYNCHRONIZED_BIT.José Fonseca2009-11-061-0/+3
|
* Merge branch 'mesa_7_6_branch'Brian Paul2009-11-032-12/+22
|\
| * st/mesa: clip pixels in draw_stencil_pixels to avoid crashMarek Olšák2009-11-031-5/+15
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * st/mesa: don't use util_blit_pixels_writemask() for depth or depth/stencilBrian Paul2009-11-031-0/+2
| | | | | | | | | | | | | | | | util_blit_pixels_writemask() only works for color formats at this time. Also, it might never work for depth/stencil surfaces since we can't get handle stencil values in a fragment shader. Fixes glCopyTexSubImage(GL_DEPTH_COMPONENT).
| * st/mesa: fix tests for depth and depth/stencil texture formatsBrian Paul2009-11-031-7/+5
| |
* | mesa: Add MESA_FORMAT_Z24_X8.José Fonseca2009-10-291-0/+2
| |
* | st/mesa: fix PIPE_FORMAT_X8Z24 <> MESA_FORMAT_X8_Z24 conversionDavid Heidelberger2009-10-291-0/+2
| | | | | | | | | | Signed-off-by: David Heidelberger <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* | st/mesa: Add conversion from PIPE_FORMAT_X8Z24_UNORM to MESA_FORMAT_S8_Z24.David Heidelberger2009-10-291-0/+2
| | | | | | | | | | | | | | Fix glxgears and openarena for Nouveau (no more asserts and crash). Signed-off-by: David Heidelberger <[email protected] Signed-off-by: Brian Paul <[email protected]>
* | st/mesa: Fix nouveau glxinfo after merging texformat-rework.David Heidelberger2009-10-291-0/+6
| | | | | | | | | | Signed-off-by: David Heidelberger <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* | mesa: Fix compilation errors and warnings when features are disabled.Chia-I Wu2009-10-291-0/+2
| | | | | | | | | | | | Some of the fixes are cherry-picked from opengl-es branch. Signed-off-by: Chia-I Wu <[email protected]>
* | Merge branch 'texformat-rework'Brian Paul2009-10-288-153/+215
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | mesa: choose texture format in core mesa, not driversBrian Paul2009-10-251-4/+0
| | | | | | | | | | | | | | | | | | 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.
| * | mesa: remove _mesa_compressed_row_stride() callsBrian Paul2009-10-251-2/+1
| | |
| * | mesa: remove ctx->Driver.CompressedTextureSize() hookBrian Paul2009-10-241-1/+0
| | | | | | | | | | | | It always just called _mesa_compressed_texture_size() anyway.
| * | mesa: change compressed texture size callsBrian Paul2009-10-241-5/+4
| | | | | | | | | | | | | | | Replace calls to ctx->Driver.CompressedTextureSize with calls to _mesa_format_image_size. The former always called the later.
| * | mesa: remove a bunch of gl_renderbuffer fieldsBrian Paul2009-10-085-40/+106
| | | | | | | | | | | | | | | | | | _ActualFormat is replaced by Format (MESA_FORMAT_x). ColorEncoding, ComponentType, RedBits, GreenBits, BlueBits, etc. are all replaced by MESA_FORMAT_x queries.
| * | mesa: removed gl_texture_image::CompressedSize fieldBrian Paul2009-10-011-5/+5
| | | | | | | | | | | | | | | Just call ctx->Driver.CompressedTextureSize() when we need to get the compressed image size.
| * | mesa: move mesa_set_fetch_functions()Brian Paul2009-10-012-1/+3
| | |
| * | mesa: remove gl_texture_image::IsCompressed fieldBrian Paul2009-10-011-3/+2
| | | | | | | | | | | | Use _mesa_is_format_compressed() instead.
| * | st/mesa: update commentBrian Paul2009-09-301-1/+1
| | |
| * | mesa: replace gl_texture_format with gl_formatBrian Paul2009-09-306-51/+52
| | | | | | | | | | | | | | | | | | Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum. ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x. gl_texture_format will go away next.
| * | st/mesa: use _mesa_texstore()Brian Paul2009-09-282-60/+47
| | |
| * | mesa: change _mesa_format_to_type_and_comps() format parameter typeBrian Paul2009-09-271-1/+1
| | |
| * | mesa: use texture format functionsBrian Paul2009-09-272-4/+4
| | |
| * | st/mesa: use _mesa_get_texstore_func()Brian Paul2009-09-271-37/+47
| | |
| * | st/mesa: use _mesa_get_texstore_func()Brian Paul2009-09-271-11/+15
| | |
* | | mesa/st: fix crash in st_texture_image_copyMarek Olšák2009-10-281-6/+15
| | | | | | | | | | | | Signed-off-by: Corbin Simpson <[email protected]>
* | | gallium: remove the swizzling parts of ExtSwizzleKeith Whitwell2009-10-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | These haven't been used by the mesa state tracker since the conversion to tgsi_ureg, and it seems that none of the other state trackers are using it either. This helps simplify one of the biggest suprises when starting off with TGSI shaders.
* | | gallium: remove noise opcodesKeith Whitwell2009-10-231-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a dummy implementation in the GL state tracker (move 0.5 to the destination regs). At some point, a motivated person could add a better implementation of noise. Currently not even the nvidia binary drivers do anything more than this. In any case, the place to do this is in the GL state tracker, not the poor driver.
* | | gallium: Permit surface_copy and surface_fill to be NULL.Corbin Simpson2009-10-174-14/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uf. Lots of files touched. Would people with working vega, xorg, dri1, etc. please make sure you are not broken, and fix yourself up if you are. There were only two or three places where the code did not have painful fallbacks, so I would advise st maintainers to find less painful workarounds, or consider overhauling util_surface_copy and util_surface_fill. Per ymanton, darktama, and Dr_Jakob's suggestions, clear has been left as-is. I will not add PIPE_CAP_BLITTER unless it is deemed necessary.
* | | Merge branch 'mesa_7_6_branch'Brian Paul2009-10-101-0/+7
|\ \ \ | | |/ | |/|
| * | st/mesa: create aux buffers according to visualBrian Paul2009-10-091-0/+7
| | | | | | | | | | | | Fixes bug 24426 for gallium.
* | | mesa/st: add missing mesa constant file nameKeith Whitwell2009-10-071-10/+11
| | | | | | | | | | | | | | | There are many different names for constants in mesa, we were missing one since the ureg rewrite.