OSDN Git Service

r300: use _mesa_meta_Clear for buffer clears
authorMaciej Cencora <m.cencora@gmail.com>
Sat, 7 Nov 2009 19:03:57 +0000 (20:03 +0100)
committerMaciej Cencora <m.cencora@gmail.com>
Fri, 11 Dec 2009 23:52:50 +0000 (00:52 +0100)
src/mesa/drivers/dri/r300/Makefile
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c [deleted file]
src/mesa/drivers/dri/r300/r300_ioctl.h [deleted file]
src/mesa/drivers/dri/r300/r300_render.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c

index cb0f715..9fd0133 100644 (file)
@@ -45,7 +45,6 @@ DRIVER_SOURCES = \
                 radeon_screen.c \
                 r300_context.c \
                 r300_draw.c \
-                r300_ioctl.c \
                 r300_cmdbuf.c \
                 r300_state.c \
                 r300_render.c \
index ad8db6e..efeeb06 100644 (file)
@@ -45,7 +45,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_drm.h"
 
 #include "r300_context.h"
-#include "r300_ioctl.h"
 #include "r300_reg.h"
 #include "r300_cmdbuf.h"
 #include "r300_emit.h"
index 5f07b95..67183c3 100644 (file)
@@ -55,13 +55,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/t_vp_build.h"
 
 #include "drivers/common/driverfuncs.h"
+#include "drivers/common/meta.h"
 
 #include "r300_context.h"
 #include "radeon_context.h"
 #include "radeon_span.h"
 #include "r300_cmdbuf.h"
 #include "r300_state.h"
-#include "r300_ioctl.h"
 #include "r300_tex.h"
 #include "r300_emit.h"
 #include "r300_swtcl.h"
@@ -451,6 +451,13 @@ static void r300InitGLExtensions(GLcontext *ctx)
        }
 }
 
+static void r300InitIoctlFuncs(struct dd_function_table *functions)
+{
+       functions->Clear = _mesa_meta_Clear;
+       functions->Finish = radeonFinish;
+       functions->Flush = radeonFlush;
+}
+
 /* Create the device specific rendering context.
  */
 GLboolean r300CreateContext(const __GLcontextModes * glVisual,
index 07e6223..3759ca2 100644 (file)
@@ -49,7 +49,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_context.h"
 #include "r300_state.h"
 #include "r300_emit.h"
-#include "r300_ioctl.h"
 #include "r300_render.h"
 #include "r300_swtcl.h"
 
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
deleted file mode 100644 (file)
index 5cb04e2..0000000
+++ /dev/null
@@ -1,782 +0,0 @@
-/*
-Copyright (C) The Weather Channel, Inc.  2002.
-Copyright (C) 2004 Nicolai Haehnle.
-All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/**
- * \file
- *
- * \author Keith Whitwell <keith@tungstengraphics.com>
- *
- * \author Nicolai Haehnle <prefect_@gmx.net>
- */
-
-#include <sched.h>
-#include <errno.h>
-
-#include "main/glheader.h"
-#include "main/imports.h"
-#include "main/macros.h"
-#include "main/context.h"
-#include "main/simple_list.h"
-#include "swrast/swrast.h"
-
-#include "radeon_common.h"
-#include "radeon_lock.h"
-#include "r300_context.h"
-#include "r300_ioctl.h"
-#include "r300_cmdbuf.h"
-#include "r300_state.h"
-#include "r300_vertprog.h"
-#include "radeon_reg.h"
-#include "r300_emit.h"
-#include "r300_context.h"
-
-#include "vblank.h"
-
-#define R200_3D_DRAW_IMMD_2      0xC0003500
-
-#define CLEARBUFFER_COLOR      0x1
-#define CLEARBUFFER_DEPTH      0x2
-#define CLEARBUFFER_STENCIL    0x4
-
-#if 1
-
-/**
- * Fragment program helper macros
- */
-
-/* Produce unshifted source selectors */
-#define FP_TMP(idx) (idx)
-#define FP_CONST(idx) ((idx) | (1 << 5))
-
-/* Produce source/dest selector dword */
-#define FP_SELC_MASK_NO                0
-#define FP_SELC_MASK_X         1
-#define FP_SELC_MASK_Y         2
-#define FP_SELC_MASK_XY                3
-#define FP_SELC_MASK_Z         4
-#define FP_SELC_MASK_XZ                5
-#define FP_SELC_MASK_YZ                6
-#define FP_SELC_MASK_XYZ       7
-
-#define FP_SELC(destidx,regmask,outmask,src0,src1,src2) \
-       (((destidx) << R300_ALU_DSTC_SHIFT) |           \
-        (FP_SELC_MASK_##regmask << 23) |               \
-        (FP_SELC_MASK_##outmask << 26) |               \
-        ((src0) << R300_ALU_SRC0C_SHIFT) |             \
-        ((src1) << R300_ALU_SRC1C_SHIFT) |             \
-        ((src2) << R300_ALU_SRC2C_SHIFT))
-
-#define FP_SELA_MASK_NO                0
-#define FP_SELA_MASK_W         1
-
-#define FP_SELA(destidx,regmask,outmask,src0,src1,src2) \
-       (((destidx) << R300_ALU_DSTA_SHIFT) |           \
-        (FP_SELA_MASK_##regmask << 23) |               \
-        (FP_SELA_MASK_##outmask << 24) |               \
-        ((src0) << R300_ALU_SRC0A_SHIFT) |             \
-        ((src1) << R300_ALU_SRC1A_SHIFT) |             \
-        ((src2) << R300_ALU_SRC2A_SHIFT))
-
-/* Produce unshifted argument selectors */
-#define FP_ARGC(source)        R300_ALU_ARGC_##source
-#define FP_ARGA(source) R300_ALU_ARGA_##source
-#define FP_ABS(arg) ((arg) | (1 << 6))
-#define FP_NEG(arg) ((arg) ^ (1 << 5))
-
-/* Produce instruction dword */
-#define FP_INSTRC(opcode,arg0,arg1,arg2) \
-       (R300_ALU_OUTC_##opcode |               \
-       ((arg0) << R300_ALU_ARG0C_SHIFT) |      \
-       ((arg1) << R300_ALU_ARG1C_SHIFT) |      \
-       ((arg2) << R300_ALU_ARG2C_SHIFT))
-
-#define FP_INSTRA(opcode,arg0,arg1,arg2) \
-       (R300_ALU_OUTA_##opcode |               \
-       ((arg0) << R300_ALU_ARG0A_SHIFT) |      \
-       ((arg1) << R300_ALU_ARG1A_SHIFT) |      \
-       ((arg2) << R300_ALU_ARG2A_SHIFT))
-
-#endif
-
-static void r300EmitClearState(GLcontext * ctx);
-
-static void r300ClearBuffer(r300ContextPtr r300, int flags,
-                           struct radeon_renderbuffer *rrb,
-                           struct radeon_renderbuffer *rrbd)
-{
-       BATCH_LOCALS(&r300->radeon);
-       GLcontext *ctx = r300->radeon.glCtx;
-       __DRIdrawablePrivate *dPriv = radeon_get_drawable(&r300->radeon);
-       GLuint cbpitch = 0;
-       r300ContextPtr rmesa = r300;
-
-       if (RADEON_DEBUG & RADEON_IOCTL)
-               fprintf(stderr, "%s: buffer %p (%i,%i %ix%i)\n",
-                       __FUNCTION__, rrb, dPriv->x, dPriv->y,
-                       dPriv->w, dPriv->h);
-
-       if (rrb) {
-               cbpitch = (rrb->pitch / rrb->cpp);
-               if (rrb->cpp == 4)
-                       cbpitch |= R300_COLOR_FORMAT_ARGB8888;
-               else
-                       cbpitch |= R300_COLOR_FORMAT_RGB565;
-
-               if (rrb->bo->flags & RADEON_BO_FLAGS_MACRO_TILE){
-                       cbpitch |= R300_COLOR_TILE_ENABLE;
-        }
-       }
-
-       /* TODO in bufmgr */
-       cp_wait(&r300->radeon, R300_WAIT_3D | R300_WAIT_3D_CLEAN);
-       end_3d(&rmesa->radeon);
-
-       if (flags & CLEARBUFFER_COLOR) {
-               assert(rrb != 0);
-               BEGIN_BATCH_NO_AUTOSTATE(6);
-               OUT_BATCH_REGSEQ(R300_RB3D_COLOROFFSET0, 1);
-               OUT_BATCH_RELOC(0, rrb->bo, 0, 0, RADEON_GEM_DOMAIN_VRAM, 0);
-               OUT_BATCH_REGVAL(R300_RB3D_COLORPITCH0, cbpitch);
-               END_BATCH();
-       }
-#if 1
-       if (flags & (CLEARBUFFER_DEPTH | CLEARBUFFER_STENCIL)) {
-               uint32_t zbpitch = (rrbd->pitch / rrbd->cpp);
-               if (rrbd->bo->flags & RADEON_BO_FLAGS_MACRO_TILE){
-                       zbpitch |= R300_DEPTHMACROTILE_ENABLE;
-        }
-               if (rrbd->bo->flags & RADEON_BO_FLAGS_MICRO_TILE){
-            zbpitch |= R300_DEPTHMICROTILE_TILED;
-        }
-               BEGIN_BATCH_NO_AUTOSTATE(6);
-               OUT_BATCH_REGSEQ(R300_ZB_DEPTHOFFSET, 1);
-               OUT_BATCH_RELOC(0, rrbd->bo, 0, 0, RADEON_GEM_DOMAIN_VRAM, 0);
-               OUT_BATCH_REGSEQ(R300_ZB_DEPTHPITCH, 1);
-               if (!r300->radeon.radeonScreen->kernel_mm)
-                       OUT_BATCH(zbpitch);
-               else
-                       OUT_BATCH_RELOC(zbpitch, rrbd->bo, zbpitch, 0, RADEON_GEM_DOMAIN_VRAM, 0);
-               END_BATCH();
-       }
-#endif
-       BEGIN_BATCH_NO_AUTOSTATE(6);
-       OUT_BATCH_REGSEQ(RB3D_COLOR_CHANNEL_MASK, 1);
-       if (flags & CLEARBUFFER_COLOR) {
-               OUT_BATCH((ctx->Color.ColorMask[BCOMP] ? RB3D_COLOR_CHANNEL_MASK_BLUE_MASK0 : 0) |
-                         (ctx->Color.ColorMask[GCOMP] ? RB3D_COLOR_CHANNEL_MASK_GREEN_MASK0 : 0) |
-                         (ctx->Color.ColorMask[RCOMP] ? RB3D_COLOR_CHANNEL_MASK_RED_MASK0 : 0) |
-                         (ctx->Color.ColorMask[ACOMP] ? RB3D_COLOR_CHANNEL_MASK_ALPHA_MASK0 : 0));
-       } else {
-               OUT_BATCH(0);
-       }
-
-
-       {
-               uint32_t t1, t2;
-
-               t1 = 0x0;
-               t2 = 0x0;
-
-               if (flags & CLEARBUFFER_DEPTH) {
-                       t1 |= R300_Z_ENABLE | R300_Z_WRITE_ENABLE;
-                       t2 |=
-                           (R300_ZS_ALWAYS << R300_Z_FUNC_SHIFT);
-               }
-
-               if (flags & CLEARBUFFER_STENCIL) {
-                       t1 |= R300_STENCIL_ENABLE;
-                       t2 |=
-                           (R300_ZS_ALWAYS <<
-                            R300_S_FRONT_FUNC_SHIFT) |
-                           (R300_ZS_REPLACE <<
-                            R300_S_FRONT_SFAIL_OP_SHIFT) |
-                           (R300_ZS_REPLACE <<
-                            R300_S_FRONT_ZPASS_OP_SHIFT) |
-                           (R300_ZS_REPLACE <<
-                            R300_S_FRONT_ZFAIL_OP_SHIFT);
-               }
-
-               OUT_BATCH_REGSEQ(R300_ZB_CNTL, 3);
-               OUT_BATCH(t1);
-               OUT_BATCH(t2);
-               OUT_BATCH(((ctx->Stencil.WriteMask[0] & R300_STENCILREF_MASK) <<
-                   R300_STENCILWRITEMASK_SHIFT) |
-                         (ctx->Stencil.Clear & R300_STENCILREF_MASK));
-               END_BATCH();
-       }
-
-       if (!rmesa->radeon.radeonScreen->kernel_mm) {
-               BEGIN_BATCH_NO_AUTOSTATE(9);
-               OUT_BATCH(cmdpacket3(r300->radeon.radeonScreen, R300_CMD_PACKET3_CLEAR));
-               OUT_BATCH_FLOAT32(dPriv->w / 2.0);
-               OUT_BATCH_FLOAT32(dPriv->h / 2.0);
-               OUT_BATCH_FLOAT32(ctx->Depth.Clear);
-               OUT_BATCH_FLOAT32(1.0);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[0]);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[1]);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[2]);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[3]);
-               END_BATCH();
-       } else {
-               OUT_BATCH(CP_PACKET3(R200_3D_DRAW_IMMD_2, 8));
-               OUT_BATCH(R300_PRIM_TYPE_POINT | R300_PRIM_WALK_RING |
-                         (1 << R300_PRIM_NUM_VERTICES_SHIFT));
-               OUT_BATCH_FLOAT32(dPriv->w / 2.0);
-               OUT_BATCH_FLOAT32(dPriv->h / 2.0);
-               OUT_BATCH_FLOAT32(ctx->Depth.Clear);
-               OUT_BATCH_FLOAT32(1.0);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[0]);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[1]);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[2]);
-               OUT_BATCH_FLOAT32(ctx->Color.ClearColor[3]);
-       }
-
-       r300EmitCacheFlush(rmesa);
-       cp_wait(&r300->radeon, R300_WAIT_3D | R300_WAIT_3D_CLEAN);
-
-       R300_STATECHANGE(r300, cb);
-       R300_STATECHANGE(r300, cmk);
-       R300_STATECHANGE(r300, zs);
-}
-
-static void r300EmitClearState(GLcontext * ctx)
-{
-       r300ContextPtr r300 = R300_CONTEXT(ctx);
-       BATCH_LOCALS(&r300->radeon);
-       __DRIdrawablePrivate *dPriv = radeon_get_drawable(&r300->radeon);
-       int i;
-       int has_tcl;
-       int is_r500 = 0;
-       GLuint vap_cntl;
-
-       has_tcl = r300->options.hw_tcl_enabled;
-
-       if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515)
-               is_r500 = 1;
-
-       /* State atom dirty tracking is a little subtle here.
-        *
-        * On the one hand, we need to make sure base state is emitted
-        * here if we start with an empty batch buffer, otherwise clear
-        * works incorrectly with multiple processes. Therefore, the first
-        * BEGIN_BATCH cannot be a BEGIN_BATCH_NO_AUTOSTATE.
-        *
-        * On the other hand, implicit state emission clears the state atom
-        * dirty bits, so we have to call R300_STATECHANGE later than the
-        * first BEGIN_BATCH.
-        *
-        * The final trickiness is that, because we change state, we need
-        * to ensure that any stored swtcl primitives are flushed properly
-        * before we start changing state. See the R300_NEWPRIM in r300Clear
-        * for this.
-        */
-       BEGIN_BATCH(31);
-       OUT_BATCH_REGSEQ(R300_VAP_PROG_STREAM_CNTL_0, 1);
-       if (!has_tcl)
-               OUT_BATCH(((((0 << R300_DST_VEC_LOC_SHIFT) | R300_DATA_TYPE_FLOAT_4) << R300_DATA_TYPE_0_SHIFT) |
-                ((R300_LAST_VEC | (2 << R300_DST_VEC_LOC_SHIFT) | R300_DATA_TYPE_FLOAT_4) << R300_DATA_TYPE_1_SHIFT)));
-       else
-               OUT_BATCH(((((0 << R300_DST_VEC_LOC_SHIFT) | R300_DATA_TYPE_FLOAT_4) << R300_DATA_TYPE_0_SHIFT) |
-                ((R300_LAST_VEC | (1 << R300_DST_VEC_LOC_SHIFT) | R300_DATA_TYPE_FLOAT_4) << R300_DATA_TYPE_1_SHIFT)));
-
-       OUT_BATCH_REGVAL(R300_FG_FOG_BLEND, 0);
-       OUT_BATCH_REGVAL(R300_VAP_PROG_STREAM_CNTL_EXT_0,
-          ((((R300_SWIZZLE_SELECT_X << R300_SWIZZLE_SELECT_X_SHIFT) |
-              (R300_SWIZZLE_SELECT_Y << R300_SWIZZLE_SELECT_Y_SHIFT) |
-              (R300_SWIZZLE_SELECT_Z << R300_SWIZZLE_SELECT_Z_SHIFT) |
-              (R300_SWIZZLE_SELECT_W << R300_SWIZZLE_SELECT_W_SHIFT) |
-              ((R300_WRITE_ENA_X | R300_WRITE_ENA_Y | R300_WRITE_ENA_Z | R300_WRITE_ENA_W) << R300_WRITE_ENA_SHIFT))
-             << R300_SWIZZLE0_SHIFT) |
-            (((R300_SWIZZLE_SELECT_X << R300_SWIZZLE_SELECT_X_SHIFT) |
-              (R300_SWIZZLE_SELECT_Y << R300_SWIZZLE_SELECT_Y_SHIFT) |
-              (R300_SWIZZLE_SELECT_Z << R300_SWIZZLE_SELECT_Z_SHIFT) |
-              (R300_SWIZZLE_SELECT_W << R300_SWIZZLE_SELECT_W_SHIFT) |
-              ((R300_WRITE_ENA_X | R300_WRITE_ENA_Y | R300_WRITE_ENA_Z | R300_WRITE_ENA_W) << R300_WRITE_ENA_SHIFT))
-             << R300_SWIZZLE1_SHIFT)));
-
-       /* R300_VAP_INPUT_CNTL_0, R300_VAP_INPUT_CNTL_1 */
-       OUT_BATCH_REGSEQ(R300_VAP_VTX_STATE_CNTL, 2);
-       OUT_BATCH((R300_SEL_USER_COLOR_0 << R300_COLOR_0_ASSEMBLY_SHIFT));
-       OUT_BATCH(R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR | R300_INPUT_CNTL_TC0);
-
-       /* comes from fglrx startup of clear */
-       OUT_BATCH_REGSEQ(R300_SE_VTE_CNTL, 2);
-       OUT_BATCH(R300_VTX_W0_FMT | R300_VPORT_X_SCALE_ENA |
-                 R300_VPORT_X_OFFSET_ENA | R300_VPORT_Y_SCALE_ENA |
-                 R300_VPORT_Y_OFFSET_ENA | R300_VPORT_Z_SCALE_ENA |
-                 R300_VPORT_Z_OFFSET_ENA);
-       OUT_BATCH(0x8);
-
-       OUT_BATCH_REGVAL(R300_VAP_PSC_SGN_NORM_CNTL, 0xaaaaaaaa);
-
-       OUT_BATCH_REGSEQ(R300_VAP_OUTPUT_VTX_FMT_0, 2);
-       OUT_BATCH(R300_VAP_OUTPUT_VTX_FMT_0__POS_PRESENT |
-                 R300_VAP_OUTPUT_VTX_FMT_0__COLOR_0_PRESENT);
-       OUT_BATCH(0); /* no textures */
-
-       OUT_BATCH_REGVAL(R300_TX_ENABLE, 0);
-
-       OUT_BATCH_REGSEQ(R300_SE_VPORT_XSCALE, 6);
-       OUT_BATCH_FLOAT32(1.0);
-       OUT_BATCH_FLOAT32(dPriv->x);
-       OUT_BATCH_FLOAT32(1.0);
-       OUT_BATCH_FLOAT32(dPriv->y);
-       OUT_BATCH_FLOAT32(1.0);
-       OUT_BATCH_FLOAT32(0.0);
-
-       OUT_BATCH_REGVAL(R300_FG_ALPHA_FUNC, 0);
-
-       OUT_BATCH_REGSEQ(R300_RB3D_CBLEND, 2);
-       OUT_BATCH(0x0);
-       OUT_BATCH(0x0);
-       END_BATCH();
-
-       R300_STATECHANGE(r300, vir[0]);
-       R300_STATECHANGE(r300, fogs);
-       R300_STATECHANGE(r300, vir[1]);
-       R300_STATECHANGE(r300, vic);
-       R300_STATECHANGE(r300, vte);
-       R300_STATECHANGE(r300, vof);
-       R300_STATECHANGE(r300, txe);
-       R300_STATECHANGE(r300, vpt);
-       R300_STATECHANGE(r300, at);
-       R300_STATECHANGE(r300, bld);
-       R300_STATECHANGE(r300, ps);
-
-       if (has_tcl) {
-               R300_STATECHANGE(r300, vap_clip_cntl);
-
-               BEGIN_BATCH_NO_AUTOSTATE(2);
-               OUT_BATCH_REGVAL(R300_VAP_CLIP_CNTL, R300_PS_UCP_MODE_CLIP_AS_TRIFAN | R300_CLIP_DISABLE);
-               END_BATCH();
-        }
-
-       BEGIN_BATCH_NO_AUTOSTATE(2);
-       OUT_BATCH_REGVAL(R300_GA_POINT_SIZE,
-               ((dPriv->w * 6) << R300_POINTSIZE_X_SHIFT) |
-               ((dPriv->h * 6) << R300_POINTSIZE_Y_SHIFT));
-       END_BATCH();
-
-       if (!is_r500) {
-               R300_STATECHANGE(r300, ri);
-               R300_STATECHANGE(r300, rc);
-               R300_STATECHANGE(r300, rr);
-
-               BEGIN_BATCH(14);
-               OUT_BATCH_REGSEQ(R300_RS_IP_0, 8);
-               for (i = 0; i < 8; ++i)
-                       OUT_BATCH(R300_RS_SEL_T(1) | R300_RS_SEL_R(2) | R300_RS_SEL_Q(3));
-
-               OUT_BATCH_REGSEQ(R300_RS_COUNT, 2);
-               OUT_BATCH((1 << R300_IC_COUNT_SHIFT) | R300_HIRES_EN);
-               OUT_BATCH(0x0);
-
-               OUT_BATCH_REGVAL(R300_RS_INST_0, R300_RS_INST_COL_CN_WRITE);
-               END_BATCH();
-       } else {
-               R300_STATECHANGE(r300, ri);
-               R300_STATECHANGE(r300, rc);
-               R300_STATECHANGE(r300, rr);
-
-               BEGIN_BATCH(14);
-               OUT_BATCH_REGSEQ(R500_RS_IP_0, 8);
-               for (i = 0; i < 8; ++i) {
-                       OUT_BATCH((R500_RS_IP_PTR_K0 << R500_RS_IP_TEX_PTR_S_SHIFT) |
-                                 (R500_RS_IP_PTR_K0 << R500_RS_IP_TEX_PTR_T_SHIFT) |
-                                 (R500_RS_IP_PTR_K0 << R500_RS_IP_TEX_PTR_R_SHIFT) |
-                                 (R500_RS_IP_PTR_K1 << R500_RS_IP_TEX_PTR_Q_SHIFT));
-               }
-
-               OUT_BATCH_REGSEQ(R300_RS_COUNT, 2);
-               OUT_BATCH((1 << R300_IC_COUNT_SHIFT) | R300_HIRES_EN);
-               OUT_BATCH(0x0);
-
-               OUT_BATCH_REGVAL(R500_RS_INST_0, R500_RS_INST_COL_CN_WRITE);
-               END_BATCH();
-       }
-
-       if (!is_r500) {
-               R300_STATECHANGE(r300, fp);
-               R300_STATECHANGE(r300, fpi[0]);
-               R300_STATECHANGE(r300, fpi[1]);
-               R300_STATECHANGE(r300, fpi[2]);
-               R300_STATECHANGE(r300, fpi[3]);
-
-               BEGIN_BATCH(17);
-               OUT_BATCH_REGSEQ(R300_US_CONFIG, 3);
-               OUT_BATCH(0x0);
-               OUT_BATCH(0x0);
-               OUT_BATCH(0x0);
-               OUT_BATCH_REGSEQ(R300_US_CODE_ADDR_0, 4);
-               OUT_BATCH(0x0);
-               OUT_BATCH(0x0);
-               OUT_BATCH(0x0);
-               OUT_BATCH(R300_RGBA_OUT);
-
-               OUT_BATCH_REGVAL(R300_US_ALU_RGB_INST_0,
-                       FP_INSTRC(MAD, FP_ARGC(SRC0C_XYZ), FP_ARGC(ONE), FP_ARGC(ZERO)));
-               OUT_BATCH_REGVAL(R300_US_ALU_RGB_ADDR_0,
-                       FP_SELC(0, NO, XYZ, FP_TMP(0), 0, 0));
-               OUT_BATCH_REGVAL(R300_US_ALU_ALPHA_INST_0,
-                       FP_INSTRA(MAD, FP_ARGA(SRC0A), FP_ARGA(ONE), FP_ARGA(ZERO)));
-               OUT_BATCH_REGVAL(R300_US_ALU_ALPHA_ADDR_0,
-                       FP_SELA(0, NO, W, FP_TMP(0), 0, 0));
-               END_BATCH();
-       } else {
-               struct radeon_state_atom r500fp;
-               uint32_t _cmd[10];
-
-               R300_STATECHANGE(r300, fp);
-               R300_STATECHANGE(r300, r500fp);
-
-               BEGIN_BATCH(7);
-               OUT_BATCH_REGSEQ(R500_US_CONFIG, 2);
-               OUT_BATCH(R500_ZERO_TIMES_ANYTHING_EQUALS_ZERO);
-               OUT_BATCH(0x0);
-               OUT_BATCH_REGSEQ(R500_US_CODE_ADDR, 3);
-               OUT_BATCH(R500_US_CODE_START_ADDR(0) | R500_US_CODE_END_ADDR(1));
-               OUT_BATCH(R500_US_CODE_RANGE_ADDR(0) | R500_US_CODE_RANGE_SIZE(1));
-               OUT_BATCH(R500_US_CODE_OFFSET_ADDR(0));
-               END_BATCH();
-
-               r500fp.check = check_r500fp;
-               r500fp.cmd = _cmd;
-               r500fp.cmd[0] = cmdr500fp(r300->radeon.radeonScreen, 0, 1, 0, 0);
-               r500fp.cmd[1] = R500_INST_TYPE_OUT |
-                       R500_INST_TEX_SEM_WAIT |
-                       R500_INST_LAST |
-                       R500_INST_RGB_OMASK_R |
-                       R500_INST_RGB_OMASK_G |
-                       R500_INST_RGB_OMASK_B |
-                       R500_INST_ALPHA_OMASK |
-                       R500_INST_RGB_CLAMP |
-                       R500_INST_ALPHA_CLAMP;
-               r500fp.cmd[2] = R500_RGB_ADDR0(0) |
-                       R500_RGB_ADDR1(0) |
-                       R500_RGB_ADDR1_CONST |
-                       R500_RGB_ADDR2(0) |
-                       R500_RGB_ADDR2_CONST;
-               r500fp.cmd[3] = R500_ALPHA_ADDR0(0) |
-                       R500_ALPHA_ADDR1(0) |
-                       R500_ALPHA_ADDR1_CONST |
-                       R500_ALPHA_ADDR2(0) |
-                       R500_ALPHA_ADDR2_CONST;
-               r500fp.cmd[4] = R500_ALU_RGB_SEL_A_SRC0 |
-                       R500_ALU_RGB_R_SWIZ_A_R |
-                       R500_ALU_RGB_G_SWIZ_A_G |
-                       R500_ALU_RGB_B_SWIZ_A_B |
-                       R500_ALU_RGB_SEL_B_SRC0 |
-                       R500_ALU_RGB_R_SWIZ_B_R |
-                       R500_ALU_RGB_B_SWIZ_B_G |
-                       R500_ALU_RGB_G_SWIZ_B_B;
-               r500fp.cmd[5] = R500_ALPHA_OP_CMP |
-                       R500_ALPHA_SWIZ_A_A |
-                       R500_ALPHA_SWIZ_B_A;
-               r500fp.cmd[6] = R500_ALU_RGBA_OP_CMP |
-                       R500_ALU_RGBA_R_SWIZ_0 |
-                       R500_ALU_RGBA_G_SWIZ_0 |
-                       R500_ALU_RGBA_B_SWIZ_0 |
-                       R500_ALU_RGBA_A_SWIZ_0;
-
-               r500fp.cmd[7] = 0;
-               if (r300->radeon.radeonScreen->kernel_mm) {
-                       emit_r500fp(ctx, &r500fp);
-               } else {
-                       int dwords = r500fp.check(ctx,&r500fp);
-                       BEGIN_BATCH_NO_AUTOSTATE(dwords);
-                       OUT_BATCH_TABLE(r500fp.cmd, dwords);
-                       END_BATCH();
-               }
-
-       }
-
-       BEGIN_BATCH(2);
-       OUT_BATCH_REGVAL(R300_VAP_PVS_STATE_FLUSH_REG, 0);
-       END_BATCH();
-
-       if (has_tcl) {
-               vap_cntl = ((10 << R300_PVS_NUM_SLOTS_SHIFT) |
-                       (5 << R300_PVS_NUM_CNTLRS_SHIFT) |
-                       (12 << R300_VF_MAX_VTX_NUM_SHIFT));
-               if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515)
-                       vap_cntl |= R500_TCL_STATE_OPTIMIZATION;
-       } else {
-               vap_cntl = ((10 << R300_PVS_NUM_SLOTS_SHIFT) |
-                       (5 << R300_PVS_NUM_CNTLRS_SHIFT) |
-                       (5 << R300_VF_MAX_VTX_NUM_SHIFT));
-       }
-
-       if (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV515)
-               vap_cntl |= (2 << R300_PVS_NUM_FPUS_SHIFT);
-       else if ((r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV530) ||
-                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV560) ||
-                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV570))
-               vap_cntl |= (5 << R300_PVS_NUM_FPUS_SHIFT);
-       else if ((r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV410) ||
-                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R420))
-               vap_cntl |= (6 << R300_PVS_NUM_FPUS_SHIFT);
-       else if ((r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R520) ||
-                (r300->radeon.radeonScreen->chip_family == CHIP_FAMILY_R580))
-               vap_cntl |= (8 << R300_PVS_NUM_FPUS_SHIFT);
-       else
-               vap_cntl |= (4 << R300_PVS_NUM_FPUS_SHIFT);
-
-       R300_STATECHANGE(r300, vap_cntl);
-
-       BEGIN_BATCH(2);
-       OUT_BATCH_REGVAL(R300_VAP_CNTL, vap_cntl);
-       END_BATCH();
-
-       if (has_tcl) {
-        struct radeon_state_atom vpu;
-        uint32_t _cmd[10];
-               R300_STATECHANGE(r300, pvs);
-               R300_STATECHANGE(r300, vap_flush);
-               R300_STATECHANGE(r300, vpi);
-
-               BEGIN_BATCH(4);
-               OUT_BATCH_REGSEQ(R300_VAP_PVS_CODE_CNTL_0, 3);
-               OUT_BATCH((0 << R300_PVS_FIRST_INST_SHIFT) |
-                         (0 << R300_PVS_XYZW_VALID_INST_SHIFT) |
-                         (1 << R300_PVS_LAST_INST_SHIFT));
-               OUT_BATCH((0 << R300_PVS_CONST_BASE_OFFSET_SHIFT) |
-                         (0 << R300_PVS_MAX_CONST_ADDR_SHIFT));
-               OUT_BATCH(1 << R300_PVS_LAST_VTX_SRC_INST_SHIFT);
-               END_BATCH();
-
-               vpu.check = check_vpu;
-               vpu.cmd = _cmd;
-               vpu.cmd[0] = cmdvpu(r300->radeon.radeonScreen, 0, 2);
-
-               vpu.cmd[1] = PVS_OP_DST_OPERAND(VE_ADD, GL_FALSE, GL_FALSE,
-                                         0, 0xf, PVS_DST_REG_OUT);
-               vpu.cmd[2] = PVS_SRC_OPERAND(0, PVS_SRC_SELECT_X, PVS_SRC_SELECT_Y,
-                                      PVS_SRC_SELECT_Z, PVS_SRC_SELECT_W,
-                                      PVS_SRC_REG_INPUT, NEGATE_NONE);
-               vpu.cmd[3] = PVS_SRC_OPERAND(0, PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_REG_INPUT, NEGATE_NONE);
-               vpu.cmd[4] = 0x0;
-
-               vpu.cmd[5] = PVS_OP_DST_OPERAND(VE_ADD, GL_FALSE, GL_FALSE, 1, 0xf,
-                                         PVS_DST_REG_OUT);
-               vpu.cmd[6] = PVS_SRC_OPERAND(1, PVS_SRC_SELECT_X,
-                                      PVS_SRC_SELECT_Y, PVS_SRC_SELECT_Z,
-                                      PVS_SRC_SELECT_W, PVS_SRC_REG_INPUT,
-                                      NEGATE_NONE);
-               vpu.cmd[7] = PVS_SRC_OPERAND(1, PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_SELECT_FORCE_0,
-                                      PVS_SRC_REG_INPUT, NEGATE_NONE);
-               vpu.cmd[8] = 0x0;
-
-               if (r300->radeon.radeonScreen->kernel_mm) {
-                       int dwords = r300->hw.vap_flush.check(ctx,&r300->hw.vap_flush);
-                       BEGIN_BATCH_NO_AUTOSTATE(dwords);
-                       OUT_BATCH_TABLE(r300->hw.vap_flush.cmd, dwords);
-                       END_BATCH();
-                       emit_vpu(ctx, &vpu);
-               } else {
-                       int dwords = vpu.check(ctx,&vpu);
-                       BEGIN_BATCH_NO_AUTOSTATE(dwords);
-                       OUT_BATCH_TABLE(vpu.cmd, dwords);
-                       END_BATCH();
-               }
-
-       }
-}
-
-static int r300KernelClear(GLcontext *ctx, GLuint flags)
-{
-       r300ContextPtr r300 = R300_CONTEXT(ctx);
-       __DRIdrawablePrivate *dPriv = radeon_get_drawable(&r300->radeon);
-       struct radeon_framebuffer *rfb = dPriv->driverPrivate;
-       struct radeon_renderbuffer *rrb;
-       struct radeon_renderbuffer *rrbd;
-       int bits = 0, ret;
-
-       /* Make sure it fits there. */
-       radeon_cs_space_reset_bos(r300->radeon.cmdbuf.cs);
-
-       if (flags & BUFFER_BIT_COLOR0) {
-               rrb = radeon_get_renderbuffer(&rfb->base, BUFFER_COLOR0);
-               radeon_cs_space_add_persistent_bo(r300->radeon.cmdbuf.cs,
-                                                 rrb->bo, 0, RADEON_GEM_DOMAIN_VRAM);
-       }
-
-       if (flags & BUFFER_BIT_FRONT_LEFT) {
-               rrb = radeon_get_renderbuffer(&rfb->base, BUFFER_FRONT_LEFT);
-               radeon_cs_space_add_persistent_bo(r300->radeon.cmdbuf.cs,
-                                                 rrb->bo, 0, RADEON_GEM_DOMAIN_VRAM);
-       }
-
-       if (flags & BUFFER_BIT_BACK_LEFT) {
-               rrb = radeon_get_renderbuffer(&rfb->base, BUFFER_BACK_LEFT);
-               radeon_cs_space_add_persistent_bo(r300->radeon.cmdbuf.cs,
-                                                 rrb->bo, 0, RADEON_GEM_DOMAIN_VRAM);
-       }
-
-       rrbd = radeon_get_renderbuffer(&rfb->base, BUFFER_DEPTH);
-       if (rrbd) {
-               radeon_cs_space_add_persistent_bo(r300->radeon.cmdbuf.cs,
-                                                 rrbd->bo, 0, RADEON_GEM_DOMAIN_VRAM);
-       }
-
-       ret = radeon_cs_space_check(r300->radeon.cmdbuf.cs);
-       if (ret)
-         return -1;
-
-       rcommonEnsureCmdBufSpace(&r300->radeon, 421 * 3, __FUNCTION__);
-       if (flags || bits)
-               r300EmitClearState(ctx);
-
-       rrbd = radeon_get_renderbuffer(&rfb->base, BUFFER_DEPTH);
-       if (rrbd && (flags & BUFFER_BIT_DEPTH))
-               bits |= CLEARBUFFER_DEPTH;
-
-       if (rrbd && (flags & BUFFER_BIT_STENCIL))
-               bits |= CLEARBUFFER_STENCIL;
-
-       if (flags & BUFFER_BIT_COLOR0) {
-               rrb = radeon_get_renderbuffer(&rfb->base, BUFFER_COLOR0);
-               r300ClearBuffer(r300, CLEARBUFFER_COLOR, rrb, NULL);
-               bits = 0;
-       }
-
-       if (flags & BUFFER_BIT_FRONT_LEFT) {
-               rrb = radeon_get_renderbuffer(&rfb->base, BUFFER_FRONT_LEFT);
-               r300ClearBuffer(r300, bits | CLEARBUFFER_COLOR, rrb, rrbd);
-               bits = 0;
-       }
-
-       if (flags & BUFFER_BIT_BACK_LEFT) {
-               rrb = radeon_get_renderbuffer(&rfb->base, BUFFER_BACK_LEFT);
-               r300ClearBuffer(r300, bits | CLEARBUFFER_COLOR, rrb, rrbd);
-               bits = 0;
-       }
-
-       if (bits)
-               r300ClearBuffer(r300, bits, NULL, rrbd);
-
-       COMMIT_BATCH();
-       return 0;
-}
-
-/**
- * Buffer clear
- */
-static void r300Clear(GLcontext * ctx, GLbitfield mask)
-{
-       r300ContextPtr r300 = R300_CONTEXT(ctx);
-       __DRIdrawablePrivate *dPriv = radeon_get_drawable(&r300->radeon);
-       const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask);
-       GLbitfield swrast_mask = 0, tri_mask = 0;
-       int i, ret;
-       struct gl_framebuffer *fb = ctx->DrawBuffer;
-
-       if (RADEON_DEBUG & RADEON_IOCTL)
-               fprintf(stderr, "r300Clear\n");
-
-       if (!r300->radeon.radeonScreen->driScreen->dri2.enabled) {
-               LOCK_HARDWARE(&r300->radeon);
-               UNLOCK_HARDWARE(&r300->radeon);
-               if (dPriv->numClipRects == 0)
-                       return;
-       }
-
-       /* Flush swtcl vertices if necessary, because we will change hardware
-        * state during clear. See also the state-related comment in
-        * r300EmitClearState.
-        */
-       R300_NEWPRIM(r300);
-
-       if (colorMask == ~0)
-         tri_mask |= (mask & BUFFER_BITS_COLOR);
-       else
-         tri_mask |= (mask & (BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT));
-
-
-       /* HW stencil */
-       if (mask & BUFFER_BIT_STENCIL) {
-               tri_mask |= BUFFER_BIT_STENCIL;
-       }
-
-       /* HW depth */
-       if (mask & BUFFER_BIT_DEPTH) {
-               tri_mask |= BUFFER_BIT_DEPTH;
-       }
-
-       /* If we're doing a tri pass for depth/stencil, include a likely color
-        * buffer with it.
-        */
-
-       for (i = 0; i < BUFFER_COUNT; i++) {
-         GLuint bufBit = 1 << i;
-         if ((tri_mask) & bufBit) {
-           if (!fb->Attachment[i].Renderbuffer->ClassID) {
-             tri_mask &= ~bufBit;
-             swrast_mask |= bufBit;
-           }
-         }
-       }
-
-       /* SW fallback clearing */
-       swrast_mask = mask & ~tri_mask;
-
-       ret = 0;
-       if (tri_mask) {
-               if (r300->radeon.radeonScreen->kernel_mm)
-                       radeonUserClear(ctx, tri_mask);
-               else {
-                       /* if kernel clear fails due to size restraints fallback */
-                       ret = r300KernelClear(ctx, tri_mask);
-                       if (ret < 0)
-                               swrast_mask |= tri_mask;
-               }
-       }
-
-       if (swrast_mask) {
-               if (RADEON_DEBUG & RADEON_FALLBACKS)
-                       fprintf(stderr, "%s: swrast clear, mask: %x\n",
-                               __FUNCTION__, swrast_mask);
-               _swrast_Clear(ctx, swrast_mask);
-       }
-}
-
-void r300InitIoctlFuncs(struct dd_function_table *functions)
-{
-       functions->Clear = r300Clear;
-       functions->Finish = radeonFinish;
-       functions->Flush = radeonFlush;
-}
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.h b/src/mesa/drivers/dri/r300/r300_ioctl.h
deleted file mode 100644 (file)
index 3abfa71..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
- *   Nicolai Haehnle <prefect_@gmx.net>
- */
-
-#ifndef __R300_IOCTL_H__
-#define __R300_IOCTL_H__
-
-#include "r300_context.h"
-#include "radeon_drm.h"
-
-extern void r300InitIoctlFuncs(struct dd_function_table *functions);
-
-#endif                         /* __R300_IOCTL_H__ */
index 4ae593c..02c9425 100644 (file)
@@ -68,7 +68,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/tnl.h"
 #include "tnl/t_vp_build.h"
 #include "r300_context.h"
-#include "r300_ioctl.h"
 #include "r300_state.h"
 #include "r300_reg.h"
 #include "r300_tex.h"
index ac20c08..da0a9df 100644 (file)
@@ -55,7 +55,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/t_vp_build.h"
 
 #include "r300_context.h"
-#include "r300_ioctl.h"
 #include "r300_state.h"
 #include "r300_reg.h"
 #include "r300_emit.h"
index 726b3ff..ac3d5b1 100644 (file)
@@ -48,7 +48,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "r300_context.h"
 #include "r300_state.h"
-#include "r300_ioctl.h"
 #include "radeon_mipmap_tree.h"
 #include "r300_tex.h"
 
index d80284e..68b90d3 100644 (file)
@@ -46,7 +46,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "r300_context.h"
 #include "r300_state.h"
-#include "r300_ioctl.h"
 #include "radeon_mipmap_tree.h"
 #include "r300_tex.h"
 #include "r300_reg.h"