summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* st/mesa: some more merge fixesChristian König2011-06-051-2/+2
|
* Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-06-0597-7109/+7773
|\
| * mesa: fix typo (s/GLGL/GLSL/)Brian Paul2011-06-021-1/+1
| |
| * mesa: 80-column wrappingBrian Paul2011-06-021-8/+14
| |
| * mesa: consolidate glGetUniform codeBrian Paul2011-06-021-124/+64
| |
| * mesa: refactor/consolidate uniform lookup codeBrian Paul2011-06-021-96/+87
| |
| * mesa: add some minor fixes for geometry shadersBrian Paul2011-06-021-0/+6
| |
| * dri: add missing files from 873379a8818eed9ab16c24728b7091a3a3705c5bBrian Paul2011-06-022-0/+112
| |
| * mesa: add implementation of glDrawElementsInstancedBaseVertexPierre-Eric Pelloux-Prayer2011-06-025-4/+35
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * glapi: regenerated filesPierre-Eric Pelloux-Prayer2011-06-022-2723/+2742
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * dri/nouveau: Fix build with --enable-shared-dricore.Johannes Obermayr2011-06-0217-140/+56
| | | | | | | | | | | | | | | | | | - Based on the work of Себастьян Gliţa Κατινα <[email protected]> - Split Makefile.template into Makefile.defines and Makefile.targets - Adapt other drivers to new situation - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=35441 Signed-off-by: Brian Paul <[email protected]>
| * r300: remove MIN3 macro, already defined in macros.hBrian Paul2011-06-021-1/+0
| |
| * mesa: faster logbase2Benjamin Bellec2011-06-021-24/+11
| | | | | | | | | | | | With minor clean-ups by Brian Paul. Signed-off-by: Brian Paul <[email protected]>
| * st/mesa: add GL_R11F_G11F_B10F to format tableBrian Paul2011-06-021-0/+4
| | | | | | | | Fixes http://bugs.freedesktop.org/show_bug.cgi?id=37839
| * i965: Raise const.MaxTextureLevels to 14 (8192)Chris Wilson2011-06-021-3/+3
| | | | | | | | | | | | | | Mesa now limits, by default, the max number of texture levels to 15 so we can now support the architectural maximum for gen4-6 of 14. Signed-off-by: Chris Wilson <[email protected]>
| * st/mesa: add format table entry for GL_RGB9_E5Brian Paul2011-06-011-0/+4
| | | | | | | | Fixes http://bugs.freedesktop.org/show_bug.cgi?id=37839
| * mesa: queries of non-existent FBO attachments should return INVALID_OPERATIONMarek Olšák2011-06-011-1/+26
| | | | | | | | | | | | | | | | | | | | | | OpenGL 4.0 Compatibility, page 449: If the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is NONE, no framebuffer is bound to target. In this case querying pname FRAMEBUFFER_- ATTACHMENT_OBJECT_NAME will return zero, and all other queries will generate an INVALID_OPERATION error. Reviewed-by: Chad Versace <[email protected]>
| * mesa: UseShaderProgramEXT and Uniform* shouldn't be allowed inside Begin/EndMarek Olšák2011-06-012-0/+6
| | | | | | | | | | | | I couldn't find this being required by the spec. Reviewed-by: Brian Paul <[email protected]>
| * r600c: add support for llanoAlex Deucher2011-05-316-1/+98
| | | | | | | | Signed-off-by: Alex Deucher <[email protected]>
| * i965/fs: Use the embedded compare in SEL on gen6+.Eric Anholt2011-05-312-16/+30
| | | | | | | | | | | | | | | | | | | | | | This avoids the extra CMP and the predication on SEL, so in addition to one less instruction, it makes scheduling less constrained. Improves glbenchmark Egypt performance 0.6% +/- 0.2% (n=3). Reduces FS instruction count across affected shaders in shader-db by 1.3% without regressing any. Reviewed-by: Kenneth Graunke <[email protected]>
| * i965: Remove brw_surface_state struct that is now unused.Eric Anholt2011-05-311-74/+0
| | | | | | | | Reviewed-by: Ian Romanick <[email protected]>
| * i965: Switch brw_state_dump to using bitshifting for surface state.Eric Anholt2011-05-312-9/+17
| | | | | | | | Reviewed-by: Ian Romanick <[email protected]>
| * i965: Replace struct with bit shifting for WM null surfaces.Eric Anholt2011-05-311-13/+13
| | | | | | | | | | | | | | | | | | Reduces compiled size of brw_wm_surface_state.o another 1.9%. Overall, this brw_wm_surface_state reduction series cuts firefox-talos-gfx runtime by 0.68% +/- 0.42% (n=6). Reviewed-by: Ian Romanick <[email protected]>
| * i965: Replace struct with bit shifting for WM pull constant surfaces.Eric Anholt2011-05-312-35/+17
| | | | | | | | | | | | This reduces compiled size (4.7% of brw_wm_surface_state.o). Reviewed-by: Ian Romanick <[email protected]>
| * i965: Replace struct with bit shifting for WM render target surfaces.Eric Anholt2011-05-312-31/+45
| | | | | | | | | | | | This massively reduces compiled size (6.7% of brw_wm_surface_state.o). Reviewed-by: Ian Romanick <[email protected]>
| * i965: Replace structs with bitfield shifting for WM texture surfaces.Eric Anholt2011-05-311-32/+35
| | | | | | | | | | | | This massively reduces compiled size (4.9% of brw_wm_surface_state.o). Reviewed-by: Ian Romanick <[email protected]>
| * i965: Add defines for surface state setup using bitfield shifting.Eric Anholt2011-05-311-1/+33
| | | | | | | | | | | | | | It turns out that gcc is just awful at generating code for brw_structs.h style state setup, and using bitshifting on u32s generates better code while being similarly readable (and more verifiable compared to the specs, using the INTEL_MASK macro).
| * i965: Don't compute brw->wm.input_size_masks when it's unused.Eric Anholt2011-05-311-1/+11
| | | | | | | | | | | | | | | | It's only used in the old fragment program path, to avoid projection when w is always 1. We do want to do this in the new path pre-gen6 too, but we'll probably do it through the ir. Reviewed-by: Kenneth Graunke <[email protected]>
| * i965: Drop a gratuitous "if" that the compiler didn't eliminate at -O2.Eric Anholt2011-05-311-10/+8
| | | | | | | | | | | | | | | | Oddly, this increases compiled code size. (marking the 'if' as likely also increases code size, but not as much). Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
| * i965: Move prepare_wm_surfaces texobj declarations inside of _ReallyEnabled.Eric Anholt2011-05-311-2/+3
| | | | | | | | | | | | | | | | Interestingly, the compiler wasn't doing this for us at -O2, so we were doing the computation for every non-_ReallyEnabled unit. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
| * intel: Remove unused NO_TILE macroIan Romanick2011-05-311-3/+0
| | | | | | | | Reviewed-by: Eric Anholt <[email protected]>
| * mesa: forbid UseProgram to be called inside Begin/EndMarek Olšák2011-05-301-0/+2
| | | | | | | | | | | | | | | | | | The spec doesn't state it should be an error, but. We have this piglit test useprogram-inside-begin that passes with this commit. No idea what's correct. NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: don't use resource_copy_region for CopyPixels with conditional renderMarek Olšák2011-05-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The conditional rendering should be able to kill CopyPixels. I assume the render condition has no effect on resource_copy_region. This fixes piglit: - NV_conditional_render/copypixels NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: conditional rendering should not kill texture decompression via blitMarek Olšák2011-05-301-0/+11
| | | | | | | | | | | | NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: CopyTex(Sub)Image should not be killed by conditional renderingMarek Olšák2011-05-301-0/+12
| | | | | | | | | | | | NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: BlitFramebuffer should not be killed by conditional renderingMarek Olšák2011-05-301-1/+13
| | | | | | | | | | | | NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]>
| * swrast: BlitFramebuffer should not be killed by conditional renderingMarek Olšák2011-05-301-3/+0
| | | | | | | | | | | | NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: GenerateMipmap should not be killed by conditional renderingMarek Olšák2011-05-303-2/+22
| | | | | | | | | | | | NOTE: This is a candidate for the 7.10 branch. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: fix typos and add some format fallbacks in format_mapMarek Olšák2011-05-301-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Always default to DEFAULT_*_FORMATS for mandatory GL formats. (st_choose_format must not fail for those) Use DEFAULT_RGBA when alpha is required instead of RGB. Use DEFAULT_RGB otherwise. These are more or less the remaining differences between the old code and the new one. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: consolidate listing of depth formatsMarek Olšák2011-05-301-11/+12
| | | | | | | | Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: add GL_DEPTH_COMPONENT32 fallback formatsMarek Olšák2011-05-301-1/+4
| | | | | | | | | | | | This makes D32 work again on chipsets which can't do it. Reviewed-by: Brian Paul <[email protected]>
| * st/mesa: fix changing internal format via RenderbufferStorageMarek Olšák2011-05-301-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is: The second time the function is called with a new internal format, strb->format is usually not PIPE_FORMAT_NONE. RenderbufferStorage(... GL_RGBA8 ...); RenderbufferStorage(... GL_RGBA16 ...); // had no effect on the format Broken with: fd6f2d6e5783d8810d0ab88e1c470958fd5eb2eb Test: piglit/fbo-storage-completeness NOTE: This is a candidate for the 7.10 branch. (if fd6f2d6e5783d8810d0ab88e1c470958fd5eb2eb is cherry-picked as well) Reviewed-by: Brian Paul <[email protected]>
| * r300g: Fix non-dri buildsTom Stellard2011-05-282-1/+7
| | | | | | | | | | This is just a temporary solution for now until there is a better way to share code between mesa and gallium.
| * mesa: set parameter list StateFlags field in _mesa_layout_parameters()Pierre-Eric Pelloux-Prayer2011-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When using _mesa_layout_parameters, all params copied in the 'layout' output in the PASS 1 don't modify StateFlags (because they are simply memcpy'ed). This patch fixes the problem, assuring output gl_prog_param_list StateFlags field is the same as the input one. NOTE: This is a candidate for the 7.10 branch. Signed-off-by: Brian Paul <[email protected]>
| * i965/fs: Fix up for 8752764076e5b3f052a57e0134424a37bf2e9164.Eric Anholt2011-05-272-4/+4
| | | | | | | | I failed to commit and squash before pushing.
| * mesa: Include shader target in dumps of GLSL source.Eric Anholt2011-05-271-1/+2
| | | | | | | | | | | | This makes automatic parsing of MESA_GLSL=dump output easier. Reviewed-by: Kenneth Graunke <[email protected]>
| * i965/fs: Do a FS compile up front at link time to produce link errors.Eric Anholt2011-05-275-27/+142
| | | | | | | | | | | | At glLinkShaders time, a fail() call in FS compile in 8-wide (the one that's required to succeed, though we may relax that at some point for pre-Ironlake performance) will now report out as a link error.
| * i965/fs: Split the GLSL IR -> FS LIR visitor to brw_fs_visitor.cpp.Eric Anholt2011-05-274-1679/+1736
| | | | | | | | | | | | | | | | | | We now have: brw_fs.cpp handles calling out to everything and optimization. brw_fs_visitor.cpp handles translating to our LIR. brw_fs_emit.cpp handles emitting from our LIR to native code. Reviewed-by: Kenneth Graunke <[email protected]>
| * i965/fs: Split the BRW native code emit to brw_fs_emit.cppEric Anholt2011-05-273-839/+876
| | | | | | | | | | | | | | This is all separate from the visitor and the optimization passes which feed into it. Reviewed-by: Kenneth Graunke <[email protected]>
| * i965: Move a couple of GLSL IR -> BRW helper functions to brw_shader.cpp.Eric Anholt2011-05-273-49/+76
| | | | | | | | | | | | These will be used by the VS backend as well. Reviewed-by: Kenneth Graunke <[email protected]>