summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mesa: Rewrite the way uniforms are tracked and handledIan Romanick2011-11-0710-252/+516
| | | | | | | | | | | | | | | | | | | | | Switch all of the code in ir_to_mesa, st_glsl_to_tgsi, glUniform*, glGetUniform, glGetUniformLocation, and glGetActiveUniforms to use the gl_uniform_storage structures in the gl_shader_program. A couple of notes: * Like most rewrite-the-world patches, this should be reviewed by applying the patch and examining the modified functions. * This leaves a lot of dead code around in linker.cpp and uniform_query.cpp. This will be deleted in the next patches. v2: Update the comment block (previously a FINISHME) in _mesa_uniform about generating GL_INVALID_VALUE when an out-of-range sampler index is specified. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* i965: Move _mesa_ir_link_shader call before device-specific linkingIan Romanick2011-11-071-3/+3
| | | | | | | | | | | | | | | _mesa_ir_link_shader needs to be called before cloning the IR tree so that the var->location field for uniforms is set. WARNING: This change breaks several integer division related piglit tests. The tests break because _mesa_ir_link_shader lowers integer division to an RCP followed by a MUL. The fix is to factor out more of the code from ir_to_mesa so that _mesa_ir_link_shader does not need to be called at all by the i965 driver. This will be the subject of several follow-on patches. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Add log_uniform and log_program_parameters to dump dataIan Romanick2011-11-071-0/+72
| | | | | | | | These were both useful debugging aids while developing this code. log_uniform will be used to keep the MESA_GLSL=uniform behavior. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* ir_to_mesa: Add _mesa_associate_uniform_storageIan Romanick2011-11-072-0/+76
| | | | | | | | Connects all of the gl_program_parameter structures with the correct gl_uniform_storage structures. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Add _mesa_uniform_{attach,detach_all}_driver_storage functionsIan Romanick2011-11-073-0/+59
| | | | | | | | These functions are used to create and destroy the connections between a uniform and the storage used by the driver to hold its value. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Add _mesa_propagate_uniforms_to_driver_storageIan Romanick2011-11-072-0/+122
| | | | | | | | This function propagates the values from the backing storage of a gl_uniform_storage structure to the driver supplied data locations. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* linker: Track uniform locations to new tracking structuresIan Romanick2011-11-072-0/+98
| | | | | | | This is just the infrastructure and the code. It's not used yet. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Add structures for "new style" uniform tracking in shader programsIan Romanick2011-11-071-0/+25
| | | | | Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* linker: Add helper class for parcelling out backing storage to uniformsIan Romanick2011-11-071-0/+86
| | | | | Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* linker: Add helper class for determining uniform usageIan Romanick2011-11-071-0/+68
| | | | | | | | | | v2: Remane class count_uniform_size based on feedback from Eric: "Maybe just "count_uniform_size"? "usage" makes me think "way it's dereferenced" or something." Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Move most of uniforms.c to uniform_query.cppIan Romanick2011-11-072-967/+945
| | | | | Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Refactor parameter validate for GetUniform, Uniform, and UniformMatrixIan Romanick2011-11-071-52/+99
| | | | | | | | v2: Update a comment block about the different treatment of location=-1 based on feedback from Ken. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Move {split,merge}_location_offset to uniforms.hIan Romanick2011-11-072-55/+57
| | | | | | | | | | | | | | | | | Prepend _mesa_uniform_ to the names and rework the calling convention. The calling convention was changed for a couple reasons. 1. Having a single variable named 'location' have completely different meanings at different places in the function is confusing. Before calling split_location_offset the location is the encoded value returned by glGetUniformLocation. After calling split_location_offset it's the index of the uniform in the gl_uniform_list::Uniforms array. 2. In a later commit the original value of 'location' is needed after split_location_offset has been called. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* glsl: Add new structures for tracking uniforms in linked shadersIan Romanick2011-11-071-0/+125
| | | | | | | | | | | | | | v2: Update some comments based on feedback from Eric Anholt. v3: Remove gl_uniform_storage::dirty field. Make gl_uniform_storage::initialized be bool, and make gl_uniform_storage::sampler be uint8_t. v4: Include stdbool.h after Tom Stellard noticed a build failure that was introduced by the changes in v2. Oops. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Make get_uniform available outside compilation unitIan Romanick2011-11-072-7/+11
| | | | | | | Also rename to _mesa_get_uniform. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Move the link check from _mesa_get_uniform_location to ↵Ian Romanick2011-11-071-5/+11
| | | | | | | | | | _mesa_GetUniformLocationARB There are cases where we might want to internally query the location of a uniform in a shader that failed linking. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* linker: Make invalidate_variable_locations available outside the compilation ↵Ian Romanick2011-11-072-5/+9
| | | | | | | unit Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* glsl: Allow glsl_types.h to be included in C sourcesIan Romanick2011-11-071-8/+15
| | | | | | | | Some C code will want access to the glsl_base_type and glsl_sampler_dim enums in the near future. Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Add string_to_uint_map::clear method to clear the mapIan Romanick2011-11-071-0/+8
| | | | | Signed-off-by: Ian Romanick <[email protected]> Tested-by: Tom Stellard <[email protected]>
* mesa: Fix error generation for glClearBuffer{i ui}v with GL_DEPTH or GL_STENCILIan Romanick2011-11-071-0/+84
| | | | | | | | | | | | | | | | | | | | The spec says "Only ClearBufferiv should be used to clear stencil buffers." and "Only ClearBufferfv should be used to clear depth buffers." However, on the following page it also says: "The result of ClearBuffer is undefined if no conversion between the type of the specified value and the type of the buffer being cleared is defined (for example, if ClearBufferiv is called for a fixed- or floating-point buffer, or if ClearBufferfv is called for a signed or unsigned integer buffer). *This is not an error.*" Emphasis mine. Fixes problems with piglit's clearbuffer-invalid-drawbuffer test. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* mesa: fix the selection of soft renderbuffer color formatsBrian Paul2011-11-071-7/+17
| | | | | | | | | | | | | | This fixes a regression from the recent glReadPixels changes found with the piglit hiz tests. Use either MESA_FORMAT_RGBA8888 or MESA_FORMAT_RGBA8888_REV for color buffers depending on endian-ness. Before, the gl_renderbuffer::Format field was MESA_FORMAT_RGBA8888 but the data was really stored as MESA_FORMAT_RGBA8888_REV when using a little endian machine. Getting this right matters now that we can access renderbuffer data without going through the span functions (namely glReadPixels() + MapRenderbuffer()).
* mesa: remove unneeded soft renderbuffer format-setting codeBrian Paul2011-11-071-16/+0
| | | | | | | | These vars will just get overwritten when we call _mesa_add_renderbuffer() anyway. We only need to set the InternalFormat field when we create the software renderbuffer. Reviewed-by: Eric Anholt <[email protected]>
* mesa: fix comment typo in intel_renderbufferBrian Paul2011-11-071-1/+1
|
* intel: update intel_texture_image commentBrian Paul2011-11-071-1/+1
|
* intel: wrap comment and fix typoBrian Paul2011-11-071-2/+2
|
* st/mesa: first implementation of Map/UnmapRenderbuffer()Brian Paul2011-11-072-0/+61
| | | | Untested, but also unused at this point.
* xlib: implement renderbuffer mapping/unmappingBrian Paul2011-11-074-5/+167
| | | | | | | | This fixes the glReadPixels() regression for reading from the front/back color buffers. Note, we only allow one mapping of an XImage/Pixmap renderbuffer at any time. That might need to be revisited in the future.
* mesa: check for immutable texture in _mesa_test_texobj_completeness()Brian Paul2011-11-071-4/+9
| | | | | | One of the points of GL_ARB_texture_storage is to make it impossible to have malformed mipmap stacks. If we know the texture object is immutable, we can skip a bunch of size checking.
* swrast: update program type assertionBrian Paul2011-11-071-1/+3
| | | | | | | Fixes bogus failed assertion when using NV_fragment_program, such as with demos/fplight.c Note: This is a candidate for the 7.11 branch.
* st/mesa: clean-up st_translate_interp()Brian Paul2011-11-071-3/+7
|
* st/mesa: add some null pointer checking to better handle out of memoryBrian Paul2011-11-073-10/+61
| | | | Reviewed-by: José Fonseca <[email protected]>
* st/mesa: fix memory leaksMorgan Armand2011-11-071-2/+2
| | | | Signed-off-by: Brian Paul <[email protected]>
* st/mesa: fix indentationMorgan Armand2011-11-072-9/+8
| | | | Signed-off-by: Brian Paul <[email protected]>
* softpipe: fix memory leaksMorgan Armand2011-11-072-1/+7
| | | | | | This series of patches is a splitted version of my previous one, as suggested by Brian. Signed-off-by: Brian Paul <[email protected]>
* i965: Fix Sandybridge regression introduced by workaround-free math.Kenneth Graunke2011-11-071-1/+1
| | | | | | | | | Commit a73c65c5342bf41fa0dfefe7daa9197ce6a11db4 had a typo which accidentally enabled the workaround-free Gen7 code on Gen6. Fixes GPU hangs in anything using pow() or integer division/modulus. Signed-off-by: Kenneth Graunke <[email protected]>
* i965: Enable faster workaround-free math on Ivybridge.Kenneth Graunke2011-11-076-17/+81
| | | | | | | | | | | | | | | | | | | | | | According to the documentation, Ivybridge's math instruction works in SIMD16 mode for the fragment shader, and no longer forbids align16 mode for the vertex shader. The documentation claims that SIMD16 mode isn't supported for INT DIV, but empirical evidence shows that it works fine. Presumably the note is trying to warn us that the variant that returns both quotient and remainder in (dst, dst + 1) doesn't work in SIMD16 mode since dst + 1 would be sechalf(dst), trashing half your results. Since we don't use that variant, we don't care and can just enable SIMD16 everywhere. The documentation also still claims that source modifiers and conditional modifiers aren't supported, but empirical evidence and study of the simulator both show that they work just fine. Goodbye workarounds. Math just works now. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Paul Berry <[email protected]>
* mesa: add missing checks to compute_versionMarek Olšák2011-11-071-0/+5
| | | | | Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* radeon: cleanup radeon shared code after r300 and r600 classic drivers removalFabio Pedretti2011-11-0710-958/+39
| | | | Signed-off-by: Dave Airlie <[email protected]>
* i965: Fix struct vs class warnings in brw_fs_vector_splitting.cpp.Kenneth Graunke2011-11-061-2/+2
| | | | | | Makes clang happier. Signed-off-by: Kenneth Graunke <[email protected]>
* llvmpipe: fix typo in the depth sampling aos code.Dave Airlie2011-11-061-1/+1
| | | | | | Just found by reading llvmpipe code for no great reason. Signed-off-by: Dave Airlie <[email protected]>
* llvmpipe: enable RGTC after u_format fix.Dave Airlie2011-11-061-5/+0
| | | | | | The two piglit tests pass + render correctly. Signed-off-by: Dave Airlie <[email protected]>
* u_format: fix RGTC support in fits 8unorm.Dave Airlie2011-11-061-2/+7
| | | | | | Signed RGTC won't fit in a unorm, so don't allow them. Signed-off-by: Dave Airlie <[email protected]>
* scons: add CPP_SOURCES for nv50/nvc0Chia-I Wu2011-11-062-2/+4
|
* android: add CPP_SOURCES for nv50/nvc0Chia-I Wu2011-11-062-4/+4
|
* android: reorder nouveau pipe driversChia-I Wu2011-11-061-2/+2
| | | | | | | | To match targerts/dri-nouveau, and to fix a potential "undefined reference to `nv50_ir::getTargetNVC0(unsigned int)'" error.
* gl3.txt: update for ARB_texture_storage.Dave Airlie2011-11-061-1/+1
| | | | | | As per Brian's suggestion. Signed-off-by: Dave Airlie <[email protected]>
* r600g: add initial linestipple support.Dave Airlie2011-11-066-6/+51
| | | | | | | It seems line loop stipple in hardware needs something I don't know, it might need a proper geometry shader who knows. Signed-off-by: Dave Airlie <[email protected]>
* gallivm: change sys::getHostTriple to sys::getDefaultTargetTriple for LLVM ↵Christian Inci2011-11-061-0/+4
| | | | | | | | >= 0x0301 LLVM change r143502 Signed-off-by: José Fonseca <[email protected]>
* g3dvl: Fix memory leaks on error paths.Vinson Lee2011-11-051-1/+4
| | | | | | Fixes Coverity resource leak defect. Reviewed-by: Brian Paul <[email protected]>
* pp: Reorder calloc to avoid memory leak on error path.Vinson Lee2011-11-051-3/+4
| | | | | | Fixes Coverity resource leak defect. Reviewed-by: Brian Paul <[email protected]>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 19:06:36 +0000