summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* dispatch_sanity: print names of functions that shouldnt be in dispatch table.Paul Berry2012-10-251-1/+9
| | | | | | | | | | Previously we just printed the dispatch table index and the user had to convert it to a function name. That was a pain because when FEATURE_remap_table is defined, the assignment of functions to dispatch table entries is done at run time. Acked-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]>
* mesa/st: Don't use 4bits for GL_UNSIGNED_BYTE_3_3_2(_REV)José Fonseca2012-10-251-0/+2
| | | | | | | | | | | | 4bits and 3bits quantitization values differ significantly for values other than 0 and 1. Fixes piglit draw-pixels for softpipe/llvmpipe. NOTE: Probably a candidate for stable branches. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
* glsl_to_tgsi: set correct register type for array and structure elementsBryan Cain2012-10-241-2/+19
| | | | | | | | | This fixes an issue where glsl_to_tgsi_visior::get_opcode() would emit the wrong opcode because the register type was GLSL_TYPE_ARRAY/STRUCT instead of GLSL_TYPE_FLOAT/INT/UINT/BOOL, so the function would use the float opcodes for operations on integer or boolean values dereferenced from an array or structure. Assertions have been added to get_opcode() to prevent this bug from reappearing in the future.
* mesa: Use MIN instead of CLAMP for unsigned source dataIan Romanick2012-10-241-108/+108
| | | | | | | | | | This silences a zillion GCC warnings like: ../../../src/mesa/main/pack.c: In function '_mesa_pack_rgba_span_from_uints': ../../../src/mesa/main/pack.c:560:13: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* st/mesa: Fix assertions for copying texture image to finalized miptree.Michel Dänzer2012-10-241-1/+4
| | | | | | | | | | | | | | | | | The layer dimension of array textures is not subject to mipmap minification. OTOH we were missing an assertion for the depth dimension. Fixes assertion failures with piglit {f,v}s-textureSize-sampler1DArrayShadow. For some reason, they only resulted in piglit 'warn' results for me, not failures. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56211 NOTE: This is a candidate for the stable branches. Signed-off-by: Michel Dänzer <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Andreas Boll <[email protected]>
* _mesa_create_exec_table: GLES3 fixes.Paul Berry2012-10-2310-43/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sets up the dispatch table for the following GLES3 functions when a GLES3 context is in use: - BeginQuery - BeginTransformFeedback - BindSampler - BindTransformFeedback - BlitFramebuffer - ClearBufferfi - ClearBufferfv - ClearBufferiv - ClearBufferuiv - ClientWaitSync - CopyBufferSubData - DeleteQueries - DeleteSamplers - DeleteSync - DeleteTransformFeedbacks - EndQuery - EndTransformFeedback - FenceSync - FramebufferTextureLayer - GenQueries - GenSamplers - GenTransformFeedbacks - GetInteger64v - GetQueryObjectuiv - GetQueryiv - GetSamplerParameterfv - GetSamplerParameteriv - GetStringi - GetSynciv - GetTransformFeedbackVarying - GetVertexAttribIiv - GetVertexAttribIuiv - IsQuery - IsSampler - IsSync - IsTransformFeedback - PauseTransformFeedback - RenderbufferStorageMultisample - ResumeTransformFeedback - SamplerParameterf - SamplerParameterfv - SamplerParameteri - SamplerParameteriv - TransformFeedbackVaryings - VertexAttribDivisor - VertexAttribIPointer - WaitSync And it avoids setting up the dispatch table for these non-GLES3 functions: - ColorMaski - GetBooleani_v - Enablei - Disablei - IsEnabledi - ClearColorIiEXT - ClearColorIuiEXT - TextureStorage2DEXT - TextureStorage3DEXT - GetActiveUniformName - GetnUniformdv - GetnUniformfv - GetnUniformiv - GetnUniformuiv Reviewed-by: Brian Paul <[email protected]> v2: Make the ctx argument to _mesa_init_transform_feedback_dispatch() a const pointer. Add a comment to remind us to add GetBufferParameteri64v once tests exist for it. Also add VertexAttribDivisor for GLES3, and remove GetActiveUniformName and GetnUniform{dv,fv,iv,uiv} for GLES3. Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* _mesa_create_exec_table(): deprecate ProgramStringARB.Paul Berry2012-10-231-1/+3
| | | | | | | | | This function is only useful for the ARB_{vertex,fragment}_program extensions, which we don't expose in core contexts. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* _mesa_create_exec_table: de-deprecate GetPointerv.Paul Berry2012-10-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | glGetPointerv was de-deprecated in GL 4.3, because GL 4.3 adds functionality from KHR_debug and ARB_debug_output, which require glGetPointerv. This patch modifies _mesa_create_exec_table() to populate glGetPointerv in the dispatch table for core contexts. Technically this is not in compliance with the spec--what we really ought to do for core contexts is expose glGetPointerv only when a GL 4.3 context is in use or one of the two extensions is present. However, it seems silly to go to that extra work, since the only client-visible effect would be for glGetPointerv to raise an INVALID_OPERATION error instead of an INVALID_ENUM error. Besides, the other functions set up by _mesa_create_exec_table() only depend on the API in use, not on the GL version or extensions supported. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* glapi: Alias ClampColor and ClampColorARB.Paul Berry2012-10-232-2/+0
| | | | | | | | | There's no reason to have separate slots in the dispatch table for these two functions, since they are synonymous. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* main: Fix warning ('struct gl_context' declared inside parameter list).Paul Berry2012-10-231-0/+1
| | | | | | | | This eliminates a warning in GCC 4.7.1. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* mesa: Return 0 for GL_CURRENT_QUERY with a mismatched query target.Eric Anholt2012-10-221-1/+1
| | | | | | | | With the previous two commits, this fixes piglit GL_ARB_occlusion_query2/api. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* mesa: Refuse to EndQuery with a mismatched query target.Eric Anholt2012-10-221-0/+10
| | | | | | | v2: Add a comment about what we're checking for. Reviewed-by: Brian Paul <[email protected]> (v1) Reviewed-by: Ian Romanick <[email protected]>
* mesa: Throw an error for a new query on an already-active query target.Eric Anholt2012-10-221-0/+13
| | | | | | | | There's a similar test below, but it's not the same: that one checks whether this query object is already active (potentially on another target). Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* i965: Actually add support for GL_ANY_SAMPLES_PASSED from GL_ARB_oq2.Eric Anholt2012-10-221-0/+12
| | | | | | v2: Fix mangled sentence in the comment, and make the loop exit early. Reviewed-by: Ian Romanick <[email protected]> (v1)
* st/mesa: free TGSI tokens with ureg_free_tokens()Brian Paul2012-10-221-1/+1
| | | | | | since they're allocated by ureg_get_tokens(). NOTE: This is a candidate for the 8.0 and 9.0 branches.
* st/mesa: replace REALLOC() with realloc()Brian Paul2012-10-221-8/+2
| | | | | | | | | We should use the later since we're freeing the memory with free(), not the gallium FREE() macro. This fixes a mismatch when using the gallium debug memory functions. NOTE: This is a candidate for the 9.0 branch.
* i965: Stop flushing the batch on timestamp queries, too.Eric Anholt2012-10-191-1/+0
| | | | | | | Given the usecase we have of trying to measure timestamps across individual draw calls, flushing will totally mess up what people are trying to measure. Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Don't flush the batch immediately on EndQuery.Eric Anholt2012-10-191-5/+14
| | | | | | | | | | | | | | | | The theory I had when I wrote the code was that you wanted to minimize latency on your queries because the app was going to ask soon. Only, it turns out that everybody batches up their queries and asks for the results later (often after the next SwapBuffers!), so this was a pessimization. Until now, I had no workload where it mattered enough to benchmark. Recently I started playing some Minecraft, which uses tons of queries to decide whether to render chunks of the terrain. For that app, avoiding the flush in the query-generation loop improves performance 22.7% +/- 4.7% (n=3) on an apitrace capture of it (confirmed in game by watching the fps meter found by pressing F3, 15/16 -> 20/21 fps). Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Fix typo in refactor of brw_fs_reg_allocate.cpp.Eric Anholt2012-10-191-1/+1
| | | | | I'm amazed that my usual warnings check didn't catch this, and that this passed piglit.
* i965/vs: include format argument in debug printfTapani Pälli2012-10-191-1/+1
| | | | | | | | otherwise some compilers will throw error "error: format not a string literal and no format arguments" Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Chad Versace <[email protected]>
* st/mesa: Fix source miptree level for copying data to finalized miptree.Michel Dänzer2012-10-191-1/+5
| | | | | | | | | | | | Fixes WebGL texture mips conformance test, no piglit regressions. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44912 NOTE: This is a candidate for the stable branches. Signed-off-by: Michel Dänzer <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Andreas Boll <[email protected]>
* st/mesa: improve the guess_and_alloc_texture() heuristicBrian Paul2012-10-181-0/+2
| | | | | | | | If GL_BASE_LEVEL==0 and GL_MAX_LEVEL==0 that's a pretty good hint that there'll be a single mipmap level in the texture. Google Earth sets the texture's state this way before the first glTexImage call. This saves a bit of texture memory.
* intel: Skip texsubimage fastpath for more pixel unpack state (v2)Chad Versace2012-10-181-1/+6
| | | | | | | | | | | | | | | | | | | Fixes piglit tests "unpack-teximage2d --pbo=* --format=GL_BGRA" on Sandybridge+. The fastpath was checking an incomplete set of pixel unpack state. This patch adds checks for all the fields of gl_pixelstore_attrib that affect 2D texture uploads. Also, it begins permitting the case where GL_UNPACK_ROW_LENGTH is 0. Ideally, we would just ask a unicorn to JIT this fastpath for us in a way that safely handles the unpacking state. Until then, it's safer if only a small set of situations activate the fastpath. v2: Use _mesa_is_bufferobj(), per Anholt. Reviewed-by: Eric Anholt <[email protected]> Signed-off-by: Chad Versace <[email protected]>
* Finish _HAVE_FULL_GL removalMatt Turner2012-10-173-50/+0
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Statically allocate the reg_sets at context initialization.Eric Anholt2012-10-173-49/+61
| | | | | | | Now that we've replaced all the variable settings other than reg_width, it's easy to hang on to this (the expensive part of setting up the allocator). Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Allocate registers in the unused parts of the gen7 MRF hack range.Eric Anholt2012-10-172-1/+63
| | | | | | This should also reduce register pressure on gen7+, like the previous commit. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Reduce the interference between payload regs and virtual GRFs.Eric Anholt2012-10-172-19/+152
| | | | | | | | | | | | | Improves performance of the Lightsmark penumbra shadows scene by 15.7% +/- 1.0% (n=15), by eliminating register spilling. (tested by smashing the list of scenes to have all other scenes have 0 duration -- includes additional rendering of scene description text that normally doesn't appear in that scene) v2: Allow allocation of all but g0/g1 of the payload. v3: Pull count_to_loop_end() out to a helper function. Reviewed-by: Kenneth Graunke <[email protected]> (v2, recommended v3)
* i965/fs: Expose the payload registers to the register allocator.Eric Anholt2012-10-171-7/+39
| | | | | | For now, nothing else can get allocated over them, but that will change. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Remove extra allocation for classes[].Eric Anholt2012-10-171-1/+1
| | | | | | | This was to slot in the magic aligned pairs class, but it got moved to a descriptive name later. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/fs: Make the register allocation class_sizes[] choice static.Eric Anholt2012-10-172-60/+42
| | | | | | | | Based on split_virtual_grfs(), we choose the same set every time, so set it in stone. This will help us avoid regenerating the somewhat expensive class/register set setup every compile. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/vs: Improve live interval calculation.Eric Anholt2012-10-174-96/+388
| | | | | | | | | | This is derived from the FS visitor code for the same, but tracks each channel separately (otherwise, some typical fill-a-channel-at-a-time patterns would produce excessive live intervals across loops and cause spilling). Reviewed-by: Kenneth Graunke <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48375 (crash -> failure, can turn into pass by forcing unrolling still)
* i965/vs: Fix the mlen of scratch read/write messages.Eric Anholt2012-10-171-2/+2
| | | | | | | | These messages always have m0 = g0 and m1 = offset, and write has m2 = data. Avoids regression in opt_compute_to_mrf() with a change to scratch writes to set up the data as an MRF write in the IR. Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Make the cfg reusable from the VS.Eric Anholt2012-10-175-16/+16
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Share the predicate field between FS and VS.Eric Anholt2012-10-1713-33/+32
| | | | | | | Note that BRW_PREDICATE_NONE is 0 and BRW_PREDICATE_NORMAL is 1, so that's a lot like the true/false we had in the FS before. Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Rename fs_cfg types to not mention fs.Eric Anholt2012-10-178-65/+65
| | | | | | | | fs_bblock_link -> bblock_link fs_bblock -> bblock_t (to avoid conflicting with all the fs_bblock *bblock) fs_cfg -> cfg_t (to avoid conflicting with all the fs_cfg *cfg) Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Move brw_fs_cfg.* to brw_cfg.*.Eric Anholt2012-10-177-6/+6
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Make the FS and VS share a few visitor/instruction fields.Eric Anholt2012-10-175-24/+30
| | | | | | This will let us reuse brw_fs_cfg.cpp from brw_vec4_*. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/vs: Trim the swizzle of the scratch write temporary.Eric Anholt2012-10-171-1/+16
| | | | | | | | | This fixes confusion by the upcoming live variable analysis which saw e.g. use of temp.w when only temp.xyz were initialized in the basic block, and concluded that temp.w must have come from outside of the block (even though it was never initialized anywhere). Reviewed-by: Kenneth Graunke <[email protected]>
* i965/vs: Do the temporary allocation in emit_scratch_write().Eric Anholt2012-10-173-21/+12
| | | | | | Both callers were doing basically the same thing, just written differently. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/vs: Simplify emit_scratch_write() prototype.Eric Anholt2012-10-173-8/+6
| | | | | | | Both callers used (effectively) inst->dst as the argument, so just reference it. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/vs: Add a little bit of IR-level debug ability.Eric Anholt2012-10-174-5/+96
| | | | | | | This is super basic, but it let me visualize a problem I had with opt_compute_to_mrf(). Reviewed-by: Kenneth Graunke <[email protected]>
* st/mesa: silence MSVC signed/unsigned comparison warningBrian Paul2012-10-171-1/+2
| | | | Reviewed-by: Jose Fonseca <[email protected]>
* st/mesa: silence MSVC double/unsigned assignment warningBrian Paul2012-10-171-1/+2
| | | | Reviewed-by: Jose Fonseca <[email protected]>
* wmesa: remove old, unused span codeBrian Paul2012-10-171-474/+0
|
* mesa/tests: Add ES1.1 dispatch table sanity testIan Romanick2012-10-161-0/+207
| | | | | | | | | This test actually depends on FEATURE_ES1 because _mesa_create_exec_table_es1 doesn't exist without it. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Paul Berry <[email protected]>
* mesa/tests: Compile ES2 test regardless of FEATURE_ES2 settingIan Romanick2012-10-161-4/+0
| | | | | | | | | The relevant ES2 code is always in Mesa. Always building the tests ensures that things aren't accidentally broken when people don't build with --enable-es2. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]>
* mesa: remove FEATURE_ES1 tests in enable.c codeBrian Paul2012-10-161-6/+0
| | | | Reviewed-by: Ian Romanick <[email protected]>
* mesa: remove FEATURE_ES test in _mesa_get_compressed_formats()Brian Paul2012-10-161-2/+0
| | | | Reviewed-by: Ian Romanick <[email protected]>
* mesa: remove FEATURE_ES test in _mesa_is_compressed_format()Brian Paul2012-10-161-2/+0
| | | | | | The code already has a runtime ES1 test. Reviewed-by: Ian Romanick <[email protected]>
* mesa: remove FEATURE_GL test from updated_drawbuffers()Brian Paul2012-10-161-2/+0
| | | | | | There's already a runtime test for full OpenGL. Reviewed-by: Ian Romanick <[email protected]>