summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300
AgeCommit message (Collapse)Author
2009-12-17Merge branch 'master' into pipe-format-simplifyMichal Krol
Conflicts: src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/auxiliary/draw/draw_pipe_pstipple.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_surface.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/cell/ppu/cell_texture.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_tile_cache.c src/gallium/drivers/svga/svga_state_vs.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/dri/dri_drawable.c src/gallium/state_trackers/egl/egl_surface.c src/gallium/state_trackers/python/p_device.i src/gallium/state_trackers/python/st_softpipe_winsys.c src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/image.c src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/vg_tracker.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/gallium/state_trackers/xorg/xvmc/surface.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_buffer.c src/gallium/winsys/egl_xlib/sw_winsys.c src/gallium/winsys/g3dvl/xlib/xsp_winsys.c src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c src/gallium/winsys/xlib/xlib_cell.c src/gallium/winsys/xlib/xlib_llvmpipe.c src/gallium/winsys/xlib/xlib_softpipe.c src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_texture.c
2009-12-17s/desc->type/desc->channel[0].type/Michal Krol
2009-12-15r300g: fix emission of which textures are enabledMarek Olšák
It fixes most of the "Bad CS" issues in piglit/texCombine and piglit/fbo. Some other issues of this kind will get fixed in the kernel soon (depth-only rendering, S3TC, and RGTC).
2009-12-15r300g: clean up the invariant stateMarek Olšák
2009-12-15r300g: clamp vertex indices to [min,max] everywhereMarek Olšák
2009-12-15r300g: if no colorbuffers are set, disable blending and set the color mask to 0Marek Olšák
This seems to be the only way to disable the first colorbuffer.
2009-12-15r300g: set the number of colorbuffers in RB3D_CCTLMarek Olšák
2009-12-15r300g: remove unnecessary flush in set_sampler_texturesMarek Olšák
2009-12-15r300g: add Z24X8 to the list of unsupported sampler formats on R3xx-R4xxMarek Olšák
2009-12-15r300g: add acceleration of the clear, surface_copy, and surface_fill functionsMarek Olšák
2009-12-09r300g: fix routing of vertex streams if TCL is bypassedMarek Olšák
Generating mipmaps finally works, among other things. Yay!
2009-12-09r300g: always disable unused colorbuffersMarek Olšák
2009-12-09r300g: make pow(0,0) return 1 instead of NaN in the R500 fragment shaderMarek Olšák
Unfortunately we can't fix this easily in the R300 fragment shader, and it's probably not worth the effort.
2009-12-09r300g: clean up r300_emit_aosMarek Olšák
2009-12-09Revert "Simplify the redundant meaning of format layout."Michal Krol
This reverts commit eb926ddf9eee1095c7fc12013f0b8375bbaeca6f.
2009-12-08Simplify the redundant meaning of format layout.Michal Krol
We really just need to know whether the format is compressed or not. For more detailed information format colorspace should suffice.
2009-12-08Format layout cannot be used to distinguish scaled/normalised formats.Michal Krol
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-08Remove remaining pipe format utility functions.Michal Krol
Depricate pf_type(), pf_size_*(), pf_layout() and pf_exp2(). Map depricated PIPE_FORMAT_TYPE to new UTIL_FORMAT_ values: UNKNOWN = TYPE_VOID UNORM = TYPE_UNSIGNED + LAYOUT_ARITH SNORM = TYPE_SIGNED + LAYOUT_ARITH FIXED = TYPE_FIXED FLOAT = TYPE_FLOAT USCALED = TYPE_UNSIGNED + LAYOUT_ARRAY SSCALED = TYPE_SIGNED + LAYOUT_ARRAY SRGB = TYPE_COLORSPACE_SRGB
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-03Remove pf_swizzle_* internal macros.Michal Krol
2009-12-03Move pf_get_bits/size() to u_format auxiliary module.Michal Krol
2009-12-03Move pf_get_block() to u_format auxiliary module.Michal Krol
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