summaryrefslogtreecommitdiff
path: root/src/mesa
AgeCommit message (Collapse)Author
2010-02-03mesa: increase number of texture units to MAX_COMBINED_TEXTURE_IMAGE_UNITSBrian Paul
We were misinterpretting GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS previously. It's the number of texture units for which we need to keep state; not just the total number of texture units addressable by the vertex shader plus fragment shader. Since sw Mesa independently supports 16 texture units in vertex shaders and 16 texture units in fragment shaders, the max combined units is 32. Note that the docs for glActiveTexture() indicate the max legal unit is MAX(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, MAX_TEXTURE_COORDS) - 1. A new piglit test (texunits.c) tests the various texture unit limits. I'm pretty sure I've got this all right now, but additional reviews are welcome...
2010-02-03mesa: re-dimension RasterTexCoords and CoordReplaceBrian Paul
These are limited to the number of texture coordinate units.
2010-02-03mesa: added texcoord unit assertionBrian Paul
2010-02-03mesa: use Elements() instead of MAX_TEXTURE_COORD_UNITSBrian Paul
2010-02-03mesa: added tex unit assert, use Elements() macroBrian Paul
2010-02-03mesa: check for invalid texture coord unit in glGet queriesBrian Paul
2010-02-03mesa: check/clamp texture/program matrix accessesBrian Paul
Further testing should reveal if any these assertions are hit...
2010-02-03mesa: add error check for querying invalid texture matrixBrian Paul
2010-02-03mesa: use Elements() as limit in loops over texture/program matrix stacksBrian Paul
2010-02-03mesa: add out of bounds assertions for accessing texture matrix stackBrian Paul
2010-02-03Merge branch 'gallium-embedded'José Fonseca
2010-02-03mesa: Factor out the fb initialization details from _mesa_new_framebuffer.Francisco Jerez
This should make things easier for drivers wanting to work with a "subclass" of gl_framebuffer. The complementary "_mesa_initialize_framebuffer" function is now called "_mesa_initialize_window_framebuffer" for the sake of symmetry. Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-03vbo: fix void * arithmetic warningKeith Whitwell
2010-02-03vbo: Fix up in-place splitting for non-contiguous/indexed primitives.Francisco Jerez
The in-place splitting code wasn't dealing with index buffers at all (and it was being called from vbo_split_prims for too big index buffers, causing some occasional corruption). Additionally, it wasn't taking into account primitives arrays with non-contiguous indices (e.g. given prim[0].start = 0 and prim[1].start = max_verts, it would happily call back the driver with (max_index - min_index) still greater than max_verts, causing infinite recursion). It still doesn't handle too large indexed vertex buffers: use vbo_split_copy for that.
2010-02-03mesa/st: bump the gallium version numberKeith Whitwell
This is a very informal version number, but there have been enough changes that a bump is appropriate at this time.
2010-02-03st/mesa: remove some floating point divides in viewport calculationKeith Whitwell
Compiler can't usually turn x/2.0f into x * 0.5f, though we're happy with either.
2010-02-03r300: fix compiler bugs introduced with MRT changes.Dave Airlie
the first looks like a definite bug, the second I'm not so confident of but it works. Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-02-02Track frag shader changes introduced by commit ↵Scott Moreau
4769566500be1a53dd9b4cc1a613aef439a0e3d8 Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2010-02-02mesa: Add a BITSET_FFS function.Francisco Jerez
It will be useful for the nouveau DRI driver and IMHO there's no reason to keep it private. Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-02gallium: pipe/p_inlines.h -> util/u_inlines.hJosé Fonseca
2010-02-02r300compiler: Add MRT number to debugging output.Corbin Simpson
2010-02-02r300compiler, r300 classic, r300g: Add support for MRTs in the frag shader.Corbin Simpson
This maybe breaks the vert compiler. Hopefully not.
2010-02-02r200: Fix EXT_fogcoord rendering.Pauli Nieminen
The fogcoord calue was not pushed to GPU because of implicit float to int conversion. Fix is to use float pointer to buffer object so no conversion is done in assigment
2010-02-01st/mesa: fix texture deallocation bugBrian Paul
This fixes a bug reported by Christoph Bumiller on mesa3d-dev. When a texture is first created as RGBA, then re-defined with glTexImage(internalFormat=GL_DEPTH_COMPONENT) we failed to deallocate the original texture. When this texture was bound as a FBO surface, the depth/Z surface format was RGBA instead of Z. Depending on the driver this led to a failed assertion or FBO validation failure. This patch does three things: 1. Remove ancient code that mysteriously tested if we were replacing the smallest mipmap level and tested if the texture was not a cube map texture. I can't see any reason for those tests. 2. Move the width=height=depth=0 test to after the code which frees texture data. Calling glTexImage with width=height=depth=0 and data=NULL is a way to free a single mipmap level. 3. Update the code comments. There are no apparent conform, glean or piglit regressions from this change. (cherry picked from commit 43e4b584227534e30e487e7fb7e99d6501cbcd85)
2010-02-01mesa: change _mesa_find_free_register() to find multiple free regsBrian Paul
Before, _mesa_find_free_register() would scan the given shader to find a free/unused register of the given type. But subsequent calls would return the same register again. This caused a failure in the _mesa_remove_output_reads() function which sometimes needs several free temps. Now use a new function which build a vector of 'used' flags and another function which searches that vector for an unused register starting at a position that's incremented for each call. Fixes fd.o bug 26317. Note that a regression test for this has been added to the glean/glsl1 test. (cherry picked from commit e0d01c9d7f46ccd531f8dd1a04c5ac067200ef1e)
2010-02-01st/mesa: remove duplicate calculation of fp input mappingKeith Whitwell
This was being calculated the same way in two different places. Now just do it in st_translate_fragment_program().
2010-02-01st/mesa: remove dead stfp input_map arrayKeith Whitwell
Was being calculated and not used. Also was probably incorrect...
2010-02-01mesa: added _mesa_print_vp/p_inputs() functions (debug aids)Brian Paul
2010-02-01glslcompiler: add glapi_nop.o to OBJECTSBrian Paul
2010-02-01mesa: Add missing includes.José Fonseca
2010-02-01mesa: Remove unnecessary headers.Vinson Lee
2010-01-31r600: Remove duplicate assignment.Vinson Lee
2010-01-31st/mesa: Remove unnecessary headers.Vinson Lee
2010-01-31mesa: Remove unnecessary headers.Vinson Lee
2010-01-31i965: Silence uninitialized variable warning.Vinson Lee
2010-01-30radeon: Remove unnecessary headers.Vinson Lee
2010-01-30r600: Remove unnecessary headers.Vinson Lee
2010-01-30r300: Remove unnecessary headers.Vinson Lee
2010-01-30r200: Remove unnecessary headers.Vinson Lee
2010-01-30r128: Remove unnecessary headers.Vinson Lee
2010-01-30intel: Remove unnecessary headers.Vinson Lee
2010-01-30i965: Remove unnecessary headers.Vinson Lee
2010-01-30i915: Remove unnecessary headers.Vinson Lee
2010-01-30intel: Respect texture tiling when doing a PBO blit teximage upload.Eric Anholt
Bug #26008. Fixes piglit pbo-teximage-tiling-2.
2010-01-30intel: Fix inverting of inversion test for windows in glClear cleanup.Eric Anholt
Bug #26290.
2010-01-29Merge commit 'lb2/arb_fragment_coord_conventions'Keith Whitwell
2010-01-29tnl: check that state is validated before drawingBrian Paul
(cherry picked from commit 9fd3c74724e557bc6ecc851d8552615ab3becfe2) Conflicts: src/mesa/tnl/t_draw.c
2010-01-29st/mesa: check that state is validated before drawingBrian Paul
(cherry picked from commit 4d1234e22242529c8d85f5ef0cf826af41a91570) Conflicts: src/mesa/state_tracker/st_draw.c
2010-01-29vbo: fix missing state validation bugsBrian Paul
Commit 2708ddfb06a36d8568e2aa130bf1f7d551fcd309 caused a few regressions. We need to check/validate state after calling bind_arrays() because it might set the _NEW_ARRAYS flag if the varying VP inputs change. The symptom of this problem was some attribute arrays being ignored (or interpreted as constant-valued) in glDrawRangeElements or glMultiDrawElements. A follow-on patch will add some additional asserts to try to catch this kind of thing in the future. (cherry picked from commit 3cba779e16935f7c3a0bfd8af48bd5e015068e96)
2010-01-29mesa: do state validation in _mesa_valid_to_render()Brian Paul
...rather than checking/validating before all the calls to _mesa_valid_to_render() and valid_to_render(). The next patch will actually fix some bugs... (cherry picked from commit 23eda89ec89e2bd5bc26077bd56e8d6b5d4040d4)