aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/r300
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into radeon-rewriteJerome Glisse2009-05-101-4/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/r200/r200_state.c src/mesa/drivers/dri/r300/r300_context.h src/mesa/drivers/dri/r300/r300_fragprog.c src/mesa/drivers/dri/r300/r300_state.c src/mesa/drivers/dri/r300/r300_texmem.c src/mesa/drivers/dri/r300/r300_texstate.c src/mesa/drivers/dri/r300/r500_fragprog.c src/mesa/drivers/dri/radeon/radeon_screen.c src/mesa/drivers/dri/radeon/radeon_state.c
| * mesa: in glReadBufer() set _NEW_BUFFERS, not _NEW_PIXELBrian Paul2009-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GL_READ_BUFFER is historically part of the gl_pixel_attrib group it made sense to signal changes with _NEW_PIXEL. But now with FBOs it's also part of the framebuffer state. Now _NEW_PIXEL strictly indicates pixels transfer state changes. This change avoids framebuffer state validation when any random bit of pixel-transfer state is set. DRI drivers updated too: don't check _NEW_COLOR when updating framebuffer state. I think that was just copied from the Xlib driver because we care about dither enable/disable state there.
| * Merge branch 'const-buffer-changes'Brian Paul2009-05-013-5/+8
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_curbe.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/i965/brw_wm_glsl.c
| | * r200/r300/r500: add _NEW_PROGRAM_CONSTANTS flagBrian Paul2009-04-223-5/+8
| | | | | | | | | | | | | | | | | | Make sure we detect constant buffer changes indicated by the new flag. Should be able to remove _NEW_PROGRAM (and _NEW_MODELVIEW, _NEW_LIGHT, etc) from several places (someday.
| * | r300: Increase reference count of texture objects referenced by current state.Michel Dänzer2009-04-304-9/+11
| | | | | | | | | | | | | | | | | | | | | Fixes a use-after-free reported in http://bugs.freedesktop.org/show_bug.cgi?id=20539, so this possibly fixes that bug. It has been confirmed to fix http://bugs.freedesktop.org/show_bug.cgi?id=17895 .
| * | r300: always emit output insts after all KIL instsMaciej Cencora2009-04-272-3/+46
| |/
* | r300: add missing texture formatMaciej Cencora2009-05-071-0/+1
| | | | | | | | Fixes piglit/texdepth
* | r300: moar cleanupMaciej Cencora2009-05-074-27/+5
| | | | | | | | | | | | | | - remove unused r300UpdateClipPlanes function - move reg definition to r300_reg.h - remove incorrect forward definition of tnl_UpdateFixedFunctionProgram and add proper #include - remove unreachable code
* | r300: set proper texture row alignment for IGP chipsMaciej Cencora2009-05-041-0/+5
| | | | | | | | Looks like r400 based IGP chips require 64 byte alignment
* | r300: remove unused debugging in set tex buffer pathsDave Airlie2009-04-281-1/+0
| |
* | r300: fix fragment program limitsMaciej Cencora2009-04-274-25/+38
| |
* | r300: fallback only if stencil test is enabledMaciej Cencora2009-04-271-8/+3
| |
* | r300: do front/back color selection in HW for software TCL pathMaciej Cencora2009-04-272-17/+29
| |
* | r300: fix point size clamping when point is not attenuatedMaciej Cencora2009-04-271-1/+6
| |
* | r300: fix performance regressionMaciej Cencora2009-04-271-1/+4
| | | | | | | | | | This performance regression on non TCL hw was introduced by ed4c6cbe017b4e8bacb7e012d4baaf77a20a2c33. This patch depends on "r300: always route 4 texcoord components to RS" and "r300: add point attenuation stage for TCL fallbacks".
* | r300: add point attenuation stage for TCL fallbacksMaciej Cencora2009-04-271-0/+1
| |
* | r300: always route 4 texcoord components to RSMaciej Cencora2009-04-272-66/+17
| | | | | | | | | | | | Routing <4 components may lead to lock up. Thanks to Alex Deucher for suggestion.
* | r300: flush stdout to get consistent debugging infoMaciej Cencora2009-04-272-0/+5
| |
* | r300: handle texcoords properlyMaciej Cencora2009-04-271-2/+6
| | | | | | | | add 1D texture case and setup default Q value to 1.0
* | r300: remove unnecessary function callsMaciej Cencora2009-04-272-2/+0
| | | | | | | | | | ae_create_context is called by vbo_CreateContext ae_invalidate_state is called by vbo_InvalidateState
* | r300: rename stateMaciej Cencora2009-04-274-9/+15
| | | | | | | | | | According to r300_reg.h from radeon drm module 0x4f30 is ZB_ZMASK_OFFSET. Also cleanup as trailing whitespaces.
* | r300: remove unnecessary function callsMaciej Cencora2009-04-271-4/+0
| | | | | | | | r300SetEarlyZState is called during r300UpdateShaderStates which is called for every rendering operation.
* | r300: fix cliprect valuesJerome Glisse2009-04-241-7/+8
| |
* | r300: emit cliprect when in dri2 modeJerome Glisse2009-04-241-0/+23
| |
* | Merge remote branch 'origin/master' into radeon-rewriteDave Airlie2009-04-227-96/+53
|\|
| * r300: r300 hw doesn't support any input modifiers in tex instsMaciej Cencora2009-04-211-2/+1
| |
| * r300: fix register-negate branch merge regressionMaciej Cencora2009-04-203-39/+12
| |
| * mesa: merge the prog_src_register::NegateBase and NegateAbs fieldsBrian Paul2009-04-147-71/+56
| | | | | | | | | | | | There's really no need for two negation fields. This came from the GL_NV_fragment_program extension. The new, unified Negate bitfield applies after the absolute value step.
* | r300: fix missing function declarationMaciej Cencora2009-04-191-0/+2
| |
* | r300: cleanup includesMaciej Cencora2009-04-195-19/+8
| |
* | r300: move common fp functions to seperate fileMaciej Cencora2009-04-1911-390/+358
| |
* | r300: more r300/r500 unificationMaciej Cencora2009-04-194-110/+13
| | | | | | | | reuse insert_WPOS_trailer function
* | r300: more prepare for mergeMaciej Cencora2009-04-196-23/+17
| |
* | r300: further r300/r500 merge preparationMaciej Cencora2009-04-194-3/+6
| |
* | r300: merge r300/r500 fragment program compiler structureMaciej Cencora2009-04-199-34/+25
| |
* | r300: merge r300/r500 fragment program structuresMaciej Cencora2009-04-198-169/+70
| |
* | r300: r300/r500 fp shader merge WIPMaciej Cencora2009-04-199-85/+94
| |
* | r300: general cleanupMaciej Cencora2009-04-194-51/+17
| | | | | | | | | | | | - remove unused fields - remove unused defines and macros - flatten one structure
* | r300: remove unnecessary forward function declarationMaciej Cencora2009-04-191-1/+0
| |
* | r300: context creation cleanupMaciej Cencora2009-04-191-110/+76
| | | | | | | | | | - move constant values initialization to seperate function - remove obvious comments
* | r300: we always want non NDC coords format for swtclMaciej Cencora2009-04-171-22/+3
| |
* | r300: cleanup frag prog setup a littleMaciej Cencora2009-04-175-48/+70
| | | | | | | | | | | | | | | | | | | | | | Use proper fields for marking if fp is translated, and if is translated succesfully. Now if fp gets translated (even unsuccesfully) fp->translated is true. If the translation failed (i.e. because we exceeded limit of maximum texture indirections) the fp->error is set. With a little updated fallback function it prevents non native fragment programs from beeing translated with every frame (the translation would fail anyway so there's no point to try again). Also implement IsProgramNative function for GL_FRAGMENT_PROGRAM_ARB (it should give some performance boost in apps that checks if program is native and falls back to simpler shader to meet hw limits if necessary) and cleanup indentation (remove whitespaces on empty lines).
* | r300: update r500 path for reordered WPOS and FOG fp attributesMaciej Cencora2009-04-171-18/+18
| | | | | | | | Report and regression testing by Fabio Pedretti.
* | r300: fix color tilingDave Airlie2009-04-091-2/+8
| |
* | r300: reorder fog coordinate and WPOS fp attributesMaciej Cencora2009-04-093-63/+35
| | | | | | | | | | | | | | | | HW TCL path currently assumed fog, WPOS order. The order was inverted for SW TCL path. This hopefully fixes rest of fog and WPOS related bugs. Additionally fix some indentation, don't route unnecessary components of fog coordinates for performance reasons and simplify vertex attribute emitting for SW TCL path.
* | r300: fix regression from swtcl rewriteMaciej Cencora2009-04-091-7/+18
| | | | | | | | | | | | | | Fix wrong attribute emit and revert to previous behaviour of calculating VAP_OUT_VTX_FMT_1 register value. We can't use r300VAPOutputCntl1 function because it assumes that all texture coords have 4 components and that is the case for HW TCL path, but not for SW TCL.
* | Merge remote branch 'origin/master' into radeon-rewriteDave Airlie2009-04-094-9/+12
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/r200/r200_tex.c src/mesa/drivers/dri/r300/r300_cmdbuf.c src/mesa/drivers/dri/r300/r300_context.h src/mesa/drivers/dri/r300/r300_swtcl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texmem.c src/mesa/drivers/dri/r300/r300_texstate.c src/mesa/drivers/dri/radeon/radeon_tex.c
| * dri: use BorderColor instead of _BorderChanBrian Paul2009-04-011-3/+8
| |
| * r300: cleanup swtcl a littleMaciej Cencora2009-03-251-9/+1
| | | | | | | | | | | | - remove disabled code - silence compiler warnings (uinitialized values) - remove unneeded code
| * r300_cmdbuf.c: convert cast to a form supported by Sun ccAlan Coopersmith2009-03-251-1/+1
| | | | | | | | | | | | | | Fixes Sun cc error: "r300_cmdbuf.c", line 142: invalid cast expression Signed-off-by: Alan Coopersmith <[email protected]>