summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300
AgeCommit message (Collapse)Author
2009-12-08Merge branch 'gallium-strict-aliasing'Roland Scheidegger
2009-12-08gallium: fix more potential strict aliasing issuesRoland Scheidegger
In particular, gcc man page warns that union a_union { int i; double d; }; int f() { double d = 3.0; return ((union a_union *) &d)->i; } "might" not be ok (why not?), even though it doesn't seem to generate any warnings. Hence don't use this and do the extra step to actually use assignment to get the values in/out of the union. This changes parts of 3456f9149b3009fcfce80054759d05883d3c4ee5.
2009-12-08Merge branch 'mesa_7_7_branch'Andre Maasikas
Conflicts: src/mesa/drivers/dri/r600/r700_assembler.c src/mesa/main/version.h
2009-12-07Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch.
2009-12-07gallium/util: fix util_color_[un]pack[-ub] to be strict aliasing safeRoland Scheidegger
use pointer to union instead of void pointer. gcc complained a lot, depending what the pointer originally actually was. Looks like it's in fact maybe legal to cast for instance uint pointers to union pointers as long as union contains a uint type, hence use this with some callers, other just use union util_color in the first place.
2009-12-06r300g: Clean up previous commit.Corbin Simpson
If *I* can't read it, there's a strong possibility others can't, either.
2009-12-06r300g: enhance ZTOP conditionsMarek Olšák
2009-12-06r300g: don't render if everything is culled by scissoringMarek Olšák
Otherwise a CS is refused by kernel 2.6.31 (and maybe all later versions, not sure).
2009-12-06r300g: remove redundant code and clean upMarek Olšák
2009-12-05r300g: Need to emit a hardware scissor rectangle even if scissor is disabled.Michel Dänzer
Just make it cover the whole framebuffer in that case. Otherwise the kernel CS checker may complain, e.g. running progs/demos/gearbox. That runs fast now here, but doesn't look right yet.
2009-12-04radeong: flush CS if a buffer being mapped is referenced by itMarek Olšák
Also, overlapping occlusion queries seems to work now.
2009-12-04r300g, radeong: fix the CS overflowMarek Olšák
2009-12-04r300g: fix warningsMarek Olšák
2009-12-04r300g: use $(MAKE) variableColeman Kane
Fixes bug 24501
2009-12-04Merge branch 'gallium-noblocks'Roland Scheidegger
Conflicts: src/gallium/state_trackers/xorg/xorg_exa.c
2009-12-02r300g, radeong: De-specialize r300_winsys into radeon_winsys.Corbin Simpson
There's like five good reasons for this, I swear.
2009-12-02r300g: No vertex textures here.Corbin Simpson
2009-12-02gallium: adapt drivers to interface cleanupsRoland Scheidegger
2009-12-01Merge commit 'origin/tgsi-simplify-ext'Keith Whitwell
Conflicts: src/gallium/drivers/r300/r300_vs.c
2009-12-01r300g: simplify allocations of VS output registersMarek Olšák
No need to parse TGSI tokens since it's easier to walk through shader semantics. Also fog coordinates now work reliably.
2009-12-01r300g: simplify allocations of FS input registersMarek Olšák
2009-12-01r300g: clean up derived statesMarek Olšák
The state setups which aren't derived anymore have been moved to the VS and FS objects.
2009-12-01r300g: VS->FS attribute routing reworkMarek Olšák
Now it always correctly pairs up VS and FS even if the semantics and indices of VS outputs and FS inputs don't match.
2009-12-01r300g: add R300 prefix in reg definitionsMarek Olšák
2009-12-01r300: Update for renamed sampler/texture state setters.Michal Krol
2009-11-27r300g,llvmpipe: fix some more merge problemsRoland Scheidegger
2009-11-27Merge branch 'width0'Roland Scheidegger
Conflicts: src/gallium/drivers/r300/r300_texture.c src/gallium/state_trackers/xorg/xorg_exa.c src/mesa/state_tracker/st_cb_texture.c
2009-11-26gallium: fix more statetrackers/drivers for not using texture ↵Roland Scheidegger
width/height/depth arrays
2009-11-24tgsi: rename fields of tgsi_full_src_register to reduce verbosityKeith Whitwell
SrcRegister -> Register SrcRegisterInd -> Indirect SrcRegisterDim -> Dimension SrcRegisterDimInd -> DimIndirect
2009-11-24tgsi: rename fields of tgsi_full_dst_register to reduce verbosityKeith Whitwell
DstRegister -> Register DstRegisterInd -> Indirect
2009-11-24tgsi: rename fields of tgsi_full_declaration to reduce verbosityKeith Whitwell
DeclarationRange -> Range
2009-11-24tgsi: rename fields of tgsi_full_instruction to avoid excessive verbosityKeith Whitwell
InstructionPredicate -> Predicate InstructionLabel -> Label InstructionTexture -> Texture FullSrcRegisters -> Src FullDstRegisters -> Dst
2009-11-24tgsi: reduce repetition of structure name in its membersKeith Whitwell
Rename Semantic.SemanticName to Semantic.Name. Similar for SemanticIndex, and the members of the tgsi_version struct.
2009-11-24gallium: try and update r300 and nv drivers for tgsi changesKeith Whitwell
It would be nice if these drivers built under the linux-debug header so that these types of interface changes can be minimally propogated into those drivers by people without the hardware. They don't have to generate a working driver -- though a command-dumping winsys would be an excellent for regression checking.
2009-11-23r300g: use util_bitcount()Brian Paul
2009-11-21r300g: Build fix.Corbin Simpson
Oops.
2009-11-21r300g: do not reallocate r300_vertex_info and r300_rs_block all the timeMarek Olšák
2009-11-21r300g: clean up vs/fs tabsMarek Olšák
Instead of vs_tab, we use vs_output_tab and it's local now. fs_tab hasn't been used anywhere, so I removed it and r300_update_fs_tab too.
2009-11-20r300g: silence warningsMarek Olšák
2009-11-20r300g: fix typo in r300_reg.h to prevent the RS unit from doing random thingsMarek Olšák
And reorder fragment shader inputs so that the colors are before texcoords, as is allocated by the shader compiler. This commit makes VS->FS attribute routing work on R500.
2009-11-20r300g: fix updating a vertex formatMarek Olšák
We must update PSC when we change the vertex format, e.g. vertex colors from RGBA to BGRA.
2009-11-20r300g: add texture lod clampingMarek Olšák
These now work: piglit/lodclamp piglit/levelclamp
2009-11-20r300g: Begin separating HW TCL and SW TCL state and setup.Corbin Simpson
This patch removes draw_context entirely from the HW TCL path and cleans up a few other things along the way. Hopefully, nothing got broken. Thanks to Marek Olšák for testing, review, and pointing out my bugs. :3
2009-11-20r300g: emit R300_TEX_ENABLE to indicate there are no textures boundMarek Olšák
Previously, this reg wasn't emitted at all if texture_count == 0.
2009-11-20r300g: remove variant states from emit_state_invariantMarek Olšák
2009-11-20r300g: Texrect factor cleanup.Corbin Simpson
(0, 0, 0, 1) is a much saner default value, and texrect factors only need to be (1/s, 1/t, 0, 1).
2009-11-20r300g: fix rectangle textures on r3xxMarek Olšák
Adapted from Maciej Cencora's patch.
2009-11-20r300g: Clean up bitcounting function.Corbin Simpson
I didn't see this in u_math; surely somebody else has this wheel reinvented elsewhere.
2009-11-20r300g: Use MAX3 and MIN3.Corbin Simpson
2009-11-20r300g: set better values in the R300_VAP_CNTL registerMarek Olšák