summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* mesa: set reasonable defaults in update_wrapperMarek Olšák2011-04-291-2/+5
| | | | | | | | | I was wondering why I had been getting GL_RGBA for GL_RGB9_E5. Instead of setting GL_RGBA and CHAN_TYPE for most types, use the helper functions to obtain the info. Reviewed-by: Brian Paul <[email protected]>
* prog_print: Add support for printing the TXD opcode.Kenneth Graunke2011-04-281-0/+7
| | | | Reviewed-by: Brian Paul <[email protected]>
* st/mesa: raise shader MaxParameters if driver supports moreBrian Paul2011-04-271-0/+2
| | | | | | | The default value is 64 but drivers usually advertise more, like 4096. Allows ARB vp/fp programs to use more parameters. Reviewed-by: Jose Fonseca <[email protected]>
* mesa: emit more info in program parser error messageBrian Paul2011-04-271-1/+5
|
* Revert "intel: use throttle ioctl for throttling"Eric Anholt2011-04-273-3/+13
| | | | | | | | | | | | | This reverts commit 50ade6ea697953bb17e3ca7210515fbd0411cd1e. Fixes jerky rendering again on apps that don't block on the GPU per frame and are GPU bound (e.g. 3DMMES on Ironlake). The whole point of this complicated throttle scheme is to wait on frame n-1 to have started rendering before starting frame n's rendering. Otherwise, the GPU-bound app will race ahead and call the GL to draw many nearly-identical frames, then >0ms later get stuck waiting for them (all dispatched at about the same time) to retire, then render a new batch of nearly-identical frames.
* st/mesa: choose 3-component float formats before 4-component formatsBrian Paul2011-04-271-2/+21
| | | | | | | | If GL_RGB16F or GL_RGB32F is specified let's try the 3-component float texture formats before trying the 4-component ones. Before this, GL_RGB16/32F were treated the same as GL_RGBA16/32F. Reviewed-by: Marek Olšák <[email protected]>
* st/mesa: whitespace fixesBrian Paul2011-04-271-3/+3
|
* mesa: add macros MIN3 and MAX3Marek Olšák2011-04-271-0/+4
|
* st/mesa: fix warning: ‘user_memory’ may be used uninitialized in this ↵Marek Olšák2011-04-271-1/+1
| | | | | | | function It's initialized later in a conditional the condition of which is always true the first time it's evaluated.
* Squashed commit of the following:Brian Paul2011-04-2629-6006/+6648
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 864fe253b04105b7469e5f7b064dc37637b944f8 Author: Brian Paul <[email protected]> Date: Thu Apr 21 20:13:07 2011 -0600 mesa: s/exec/disp/ in _mesa_init_histogram_dispatch() This function isn't normally compiled (FEATURE_histogram). commit f4bf45e2b94b582cacd19cdca873c5be627e4250 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:58 2011 -0600 mesa: hook up GL_ARB_robustness dispatch functions ...and advertise the extension. Signed-off-by: Brian Paul <[email protected]> commit 2b89e38e5f572dc40cebc06381ae7c5d04386998 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:58 2011 -0600 mesa: regenerated API files for GL_ARB_robustness Signed-off-by: Brian Paul <[email protected]> commit 5d5ebfb7135cec9d833adef86cbf4d0f3d9beca8 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 glapi: add ARB_robustness xml Signed-off-by: Brian Paul <[email protected]> commit 0159d1d6d99f4bbc18381dc2081c20d3aff17ac9 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 mesa: implement GL_ARB_robustness functions Signed-off-by: Brian Paul <[email protected]> commit 938fd71f4c4742f274922d53492a7290ab8d9c9b Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 mesa: add context fields for GL_ARB_robustness Signed-off-by: Brian Paul <[email protected]> commit 72075137bc79e65be03dac7e97b6dba93c3a86a4 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 mesa: standardize more bounds-checking error messages Signed-off-by: Brian Paul <[email protected]> commit 32a3fc23746db49da903fbc08afa0135af3007d2 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 mesa: standardize some bounds-checking error messages Signed-off-by: Brian Paul <[email protected]> commit cecbf1f4d164207de373dec0cadee2e84e1f9656 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 mesa: add more bounds-checking support for client memory buffers Signed-off-by: Brian Paul <[email protected]> commit edc895b52383d5bd274422db56adead1d81daf5f Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 mesa: add bounds-checking support for client memory buffers Signed-off-by: Brian Paul <[email protected]> commit 3a96ef28a538f158a219b406cd090dee70470c85 Author: nobled <[email protected]> Date: Thu Apr 21 07:53:57 2011 -0600 mesa: use is_bufferobj() helper function Signed-off-by: Brian Paul <[email protected]>
* i965/fs: Add support for compute-to-mrf in 16-wide mode.Eric Anholt2011-04-261-11/+52
| | | | | | | | | This is more painful than instruction scheduling, as we have to compare two MRF writes to see if they coincide, and have to handle partial GRF writes before that (for example, the result of a math instruction written to color). Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Typo fix a comment.Eric Anholt2011-04-261-1/+1
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Enable constant propagation in 16-wide.Eric Anholt2011-04-261-5/+3
| | | | | | | All that needed fixing was skipping the newly-possible uncompressed/sechalf partial GRF constant writes. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Fix and enable the instruction scheduler for 16-wide.Eric Anholt2011-04-261-8/+42
| | | | | | | | | | Most of the work of the scheduler is agnostic to wide dispatch. It operates on our virtual GRF file, which means instructions are generally referring to 8 or 16 wide naturally. For the MRF file management we're trying to track the actual hardware MRF file, so we need to watch if an instruction writes multiple MRFs. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for 16-wide dispatch with uniforms in use.Eric Anholt2011-04-262-8/+53
| | | | | | | | | | | | This is glued in in a bit of an ugly way -- we rely on the uniforms having been set up by 8-wide dispatch, and we just reuse them without the ability to add new uniforms for any reason, since the 8-wide compile is already completed. Today, this all works out because our optimization passes are effectively the same for both and even if they weren't, we don't reduce the set of uniforms pushed after optimization. Reviewed-by: Kenneth Graunke <[email protected]>
* hash_table: Add an iterator for doing things like cleanup of the HT.Eric Anholt2011-04-262-0/+26
| | | | | | | Without this, consumers often have to keep linked lists of the entries, at additional malloc cost. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add a little whitespace between shader dumping debug.Eric Anholt2011-04-261-1/+5
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for compr4 MRF writes.Eric Anholt2011-04-261-14/+18
| | | | | | | These reduce an emitted (not decoded) instruction per shader on g4x/gen5, but may allow for additional register coalescing as well. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for 16-wide dispatch on gen5.Eric Anholt2011-04-263-12/+93
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add initial support for 16-wide dispatch on gen6.Eric Anholt2011-04-266-81/+210
| | | | | | | | | At this point it doesn't do uniforms, which have to be laid out the same between 8 and 16. Other than that, it supports everything but flow control, which was the thing that forced us to choose 8-wide for general GLSL support. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for discard instructions in 16-wide mode.Eric Anholt2011-04-261-0/+3
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for math instructions in 16-wide mode.Eric Anholt2011-04-263-14/+45
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Fix interference calculation of pixel_[xy] in 16-wide.Eric Anholt2011-04-261-0/+23
| | | | | | Fixes glsl-fs-ceil in that mode, which produced the code in the comment. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Disable some optimization passes under 16-wide for now.Eric Anholt2011-04-262-0/+15
| | | | | | | These are fixable for 16, but that can wait until after it's basically working. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for 16-wide texturing on gen5+.Eric Anholt2011-04-261-21/+29
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for computing pixel_[xy] in 16-wide.Eric Anholt2011-04-262-10/+46
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Add support for 16-wide dispatch to the register allocator.Eric Anholt2011-04-261-19/+37
| | | | | | | | Note that the virtual grfs are in increments of the dispatch_width, not hardware registers -- this makes the 16-wide emit and 8-wide emit mostly the same. Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Move the destination reg setup for 8/16 wide to the emit code.Eric Anholt2011-04-264-10/+6
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* intel: Use tiling for dri2AllocateBuffer implementationKristian Høgsberg2011-04-261-1/+10
|
* intel: Set gen in intelInitScreen, just copy value in intelInitContextKristian Høgsberg2011-04-263-5/+14
|
* intel: Use X tiling for DRM EGL ImagesKristian Høgsberg2011-04-261-1/+1
|
* mesa: Remove SWcontext::_FogMode, use gl_context::gl_fog_attrib::Mode everywhereIan Romanick2011-04-253-3/+1
| | | | Reviewed-by: Brian Paul <[email protected]>
* main: remove duplicated includesNicolas Kaiser2011-04-252-2/+0
| | | | | | | Remove duplicated includes of guarded headers. Signed-off-by: Nicolas Kaiser <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* mesa: add stricter checks for float formats in the texstore memcpy pathMarek Olšák2011-04-251-0/+2
| | | | | E.g. when the internal format was RGBA16F and the source was RG, it would use memcpy.
* mesa: implement generate-mipmap fallback for RGB10_A2Marek Olšák2011-04-251-0/+80
| | | | | | | | | | I hit this when testing RV350, which lacks RGB10_A2 render target support. It had been missed when implementing the format and probably unused by anything else too. Not applicable to 7.10. Reviewed-by: Eric Anholt <[email protected]>
* st/mesa: fix regression since a22aba4eae9b29db731487bce90e8292f7e82c72Dave Airlie2011-04-251-2/+2
| | | | | | | | | | "st/mesa: check image size before copy_image_data_to_texture()" caused a regression in piglit fbo-generatemipmap-formats test on all gallium drivers. Level 0 for NPOT textures will not match minified values, so don't do this check for level 0. Signed-off-by: Dave Airlie <[email protected]>
* mesa: Add some comments about FRAG_RESULT_COLOR vs FRAG_RESULT_DATAn.Eric Anholt2011-04-231-0/+8
| | | | | This came from reading what swrast does, and 965 now behaves the same and gallium appears to as well.
* mesa: Fix fragment.color (no index) writes with OPTION ARB_draw_buffers.Eric Anholt2011-04-231-3/+8
| | | | | | | | | Fixes a bug in Trine where fragment.color would write FRAG_RESULT_COLOR (which is interpreted by drivers as being the "write this to all color buffers" option) instead of FRAG_RESULT_DATA0 (just the first target). Fixes piglit ATI_draw_buffers/arbfp-no-index.
* i965: Don't double-emit fragment.color writes for MRT with ARB_fp.Eric Anholt2011-04-232-35/+19
|
* i965: Fill in the remaining fields of gen5+ sampler default color.Eric Anholt2011-04-231-4/+14
| | | | Still doesn't fix texwrap.
* i965: Fix batch decode for the gen5+ sampler default color.Eric Anholt2011-04-231-6/+24
|
* intel: Add support for ARB_sampler_objects.Eric Anholt2011-04-2313-80/+99
| | | | | | | | | | | | This extension support consists of replacing "gl_texture_obj->Sampler." with "_mesa_get_samplerobj(ctx, unit)->". One instance of referencing the texture's base sampler remains in the initial miptree allocation, where I'm not sure we have a clear association with any texture unit. Tested with piglit ARB_sampler_objects/sampler-objects. Reviewed-by: Brian Paul <[email protected]>
* i965: Add support for NV_conditional_render.Eric Anholt2011-04-235-0/+17
| | | | | | | | Since we lack hardware support for it, this is a simple matter of checking _mesa_check_conditional_render at the entrypoints, and suppressing it for the metaops where it doesn't apply. Reviewed-by: Brian Paul <[email protected]>
* swrast: Disable glAccum drawing during conditional rendering.Eric Anholt2011-04-231-0/+4
|
* meta: Don't do conditional rendering on GenerateMipmaps and BlitFramebuffer.Eric Anholt2011-04-231-1/+24
| | | | | | | | | The NV_conditional_render spec calls out specific operations that conditional rendering applies to, which doesn't include these. Fixes NV_conditional_render/generatemipmap on swrast. Reviewed-by: Brian Paul <[email protected]>
* i965: Add support for ARB_texture_compression_rgtc.Eric Anholt2011-04-233-0/+11
| | | | | | | | Tested with rgtc-teximage-0[12]. EXT_texture_compression_rgtc/fbo-generatemipmap-formats fails in NPOT just like S3TC does. Reviewed-by: Brian Paul <[email protected]>
* mesa: Don't assert on the compressed convertformat for GenerateMipmaps.Eric Anholt2011-04-231-1/+0
| | | | | | | | | | | | | | This assertion doesn't make any sense to me -- the convertFormat is already something valid (tested above), and the BaseFormat dictated by convertFormat doesn't matter to the function about to be called (it's the datatype/comps that were pulled out of convertFormat). Fixes assertion failure in GL_EXT_texture_compression_rgtc/fbo-generatemipmap-formats (still has a rendering failure in NPOT like S3TC does). Reviewed-by: Brian Paul <[email protected]>
* mesa: Choose RGTC formats for GL_COMPRESSED_RED, GL_COMPRESSED_RG.Eric Anholt2011-04-231-0/+8
| | | | | | | | | We were falling through to the default R8 and RG88 formats instead of compressing when possible. Noticed by swrast fbo-blending-formats actually doing rendering. Reviewed-by: Dave Airlie <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* mesa/gdi: Address compiler warnings.José Fonseca2011-04-232-136/+131
| | | | In particular the function prototypes.
* mesa/gdi: Remove InitCritSections.cpp.José Fonseca2011-04-231-33/+0
| | | | | We are now able to declare global critical sections through other mechanisms so this is useless code.