summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* r600g: some merge fixesChristian König2011-06-052-3/+3
|
* Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-06-05167-12222/+14391
|\
| * glsl: fixed printing of structure constants.Paul Berry2011-06-031-1/+1
| | | | | | | | | | | | | | | | ir_print_visitor::visit(ir_constant *) was failing to index properly into ir->type->fields.structure, so the first field name was being reprinted for every field in the structure. Signed-off-by: Brian Paul <[email protected]>
| * AST dump: fixed printing of conditionals.Paul Berry2011-06-031-1/+1
| | | | | | | | | | | | | | ast_expression::print() had an incorrect index into the subexpressions array, so (a ? b : c) was being incorrectly rendered as (a ? b : b). Signed-off-by: Brian Paul <[email protected]>
| * r600g: move spi update to only when states change.Dave Airlie2011-06-031-2/+9
| | | | | | | | | | | | | | This updates the spi state after ps/vs binding or rasteriser state change. Signed-off-by: Dave Airlie <[email protected]>
| * cso: move cso hashes to a more table driven schemeDave Airlie2011-06-032-84/+21
| | | | | | | | | | | | this removes a bad branch pain in the hash table lookup fn. Signed-off-by: Dave Airlie <[email protected]>
| * u_prim: convert u_trim_pipe_prim to table driven.Dave Airlie2011-06-031-47/+24
| | | | | | | | | | | | | | | | This makes this function not be an always miss for the branch predictor. Noticed using cachegrind, makes a minor difference to gears numbers on r600g. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: make conv pipe prim table driven.Dave Airlie2011-06-031-32/+20
| | | | | | | | | | | | | | This is a lot more branch predictor friendly, it actually showed up in cachegrind profiles. Signed-off-by: Dave Airlie <[email protected]>
| * 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-029-7019/+7113
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * glapi: add glDrawElementsInstancedBaseVertex() function to xmlBrian Paul2011-06-021-0/+9
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * dri/nouveau: Fix build with --enable-shared-dricore.Johannes Obermayr2011-06-0221-151/+81
| | | | | | | | | | | | | | | | | | - 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
| |
| * r600g: sampler and texture state doesn't need a range/block.Dave Airlie2011-06-034-34/+50
| | | | | | | | | | | | | | | | | | These are handled separately in the winsys, so don't need the calculations done at this point. this manifested as a crash in point-sprite, Thanks to XoD on #radeon for pointing it out. Signed-off-by: Dave Airlie <[email protected]>
| * glx: Remove (unused, broken) fastImageUnpack fast pathAdam Jackson2011-06-023-70/+39
| | | | | | | | | | Reviewed-by: Brian Paul <[email protected]> Signed-off-by: Adam Jackson <[email protected]>
| * glx: Fix another case of using req outside of the display lockAdam Jackson2011-06-021-2/+2
| | | | | | | | | | Reviewed-by: Brian Paul <[email protected]> Signed-off-by: Adam Jackson <[email protected]>
| * softpipe: add a better fake implementation of fencesMarek Olšák2011-06-022-6/+5
| | | | | | | | | | | | | | | | | | | | The flush function, when asked for, should not return a NULL fence. NULL can only be returned if fences are not implemented, and st/mesa doesn't call any of the fence functions if it receives a NULL fence (because some drivers don't even set the fence hooks). ARB_sync is exposed if fence_finish is set.
| * util: faster logbase2Brian Paul2011-06-021-4/+7
| |
| * 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
| * d3d1x/sm4: don't reset 1st index of multi-dimensional operands to 0Christoph Bumiller2011-06-021-1/+1
| |
| * d3d1x/sm4: fix swizzle for 1 component operandsChristoph Bumiller2011-06-021-0/+1
| | | | | | | | | | For example, "mov o0.w, l(1)" would use imm_values[3], which is not valid.
| * 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]>
| * r600g: add spi state and move spi/vgt to modify registerDave Airlie2011-06-022-16/+35
| | | | | | | | | | | | | | | | | | This modifies the VGT state and move the SPI setup to its own discrete state. It then just sets the SPI state up and the VGT state up once and modifies them thereafter. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: decrease CPU time on set buffer resourcesDave Airlie2011-06-025-24/+92
| | | | | | | | | | | | | | | | This splits the initialisation and the setting of values in the resource buffers. We only should end up initialising once and updateing with new values when needed. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: work out range/block etc at state build time.Dave Airlie2011-06-023-10/+17
| | | | | | | | | | | | | | | | This moves the overhead of working out the range/block to state build time, it also allows the compiler to use constants for a lot of things instead of working them out each time. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: deinline r600_pipe_state_add_reg.Dave Airlie2011-06-022-12/+17
| | | | | | | | | | | | | | This is going to get too big to be a forced inline. Also going to remove it from some hotpaths. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: prepare for passing ctx into _r600_pipe_state_add_regDave Airlie2011-06-025-18/+37
| | | | | | | | | | | | | | | | This moves the functions down the file, and also adds a ctx parameter. This is precursor patch just moving stuff around and getting it ready. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: migrate macros from r600_priv.h to r600.hDave Airlie2011-06-022-10/+11
| | | | | | | | | | | | this is just an precursor change for some later patches. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: remote ctx arg to block/range macros.Dave Airlie2011-06-023-24/+24
| | | | | | | | | | | | These aren't used anymore. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: avoid copying unnecessary pieces of a block.Dave Airlie2011-06-021-11/+20
| | | | | | | | | | | | | | This just avoids copying stuff if its going to modify the number of dwords later anyways. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: optimise state setting in r600_draw_vbo.Dave Airlie2011-06-022-11/+21
| | | | | | | | | | | | | | This drop the r600_draw_vbo CPU usage on a run of nexuiz from 1.40% to 0.72% in sysprof for me on my Fusion APU. Signed-off-by: Dave Airlie <[email protected]>
| * r600g: force new evergreen blocks for large range.Dave Airlie2011-06-021-0/+3
| | | | | | | | | | | | | | This range was 76 dwords long, the 75th dword changes, the first 60 or so don't. split the block so it emits less often. Signed-off-by: Dave Airlie <[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
| * glapi: Make xserver location error more helpfulNathan Kidd2011-06-011-1/+4
| | | | | | | | | | | | | | glx code hasn't lived under xserver/GL for a long time now. Signed-off-by: Nathan Kidd <[email protected]> Signed-off-by: Brian Paul <[email protected]>
| * 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]>
| * r300g: remove unused debug option DBG_UPLOADMarek Olšák2011-06-012-15/+11
| | | | | | | | And renumber the options.
| * r600c: add support for llanoAlex Deucher2011-05-316-1/+98
| | | | | | | | Signed-off-by: Alex Deucher <[email protected]>
| * r600g: add llano supportAlex Deucher2011-05-316-0/+65
| | | | | | | | 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]>
| * wayland-drm: Check visual for being NULLBenjamin Franzke2011-05-311-1/+1
| |
| * Fiuxp make tarballs for wayland-egl/drmBenjamin Franzke2011-05-311-0/+2
| |
| * st/egl: Fix udev linkage when egl_dri2 is not buildBenjamin Franzke2011-05-312-4/+4
| |