summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/radeon/radeon_common_context.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-10-29 08:39:54 +0100
committerDave Airlie <airlied@redhat.com>2011-10-30 16:40:56 +0000
commit56d30bb00d40cd391d7a469604792a27ddcc459c (patch)
tree341324f0fee1aad34886f8ece231d4a6a0021f1d /src/mesa/drivers/dri/radeon/radeon_common_context.h
parente252af3406e46fab713b43d0d38f22ccecf2ebeb (diff)
downloadexternal_mesa3d-56d30bb00d40cd391d7a469604792a27ddcc459c.zip
external_mesa3d-56d30bb00d40cd391d7a469604792a27ddcc459c.tar.gz
external_mesa3d-56d30bb00d40cd391d7a469604792a27ddcc459c.tar.bz2
radeon/r200: drop remains of r300/r600 support along with old drm 1.x kernel
This drops all the old drmSupports* checks since KMS does them all, and it also drop R300_CLASS and R600_CLASS. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_common_context.h')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_common_context.h74
1 files changed, 0 insertions, 74 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h
index 4adbbff..17889b0 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h
@@ -93,13 +93,6 @@ struct radeon_renderbuffer
GLuint pf_pending; /**< sequence number of pending flip */
__DRIdrawable *dPriv;
-
- /* r6xx+ tiling */
- GLuint tile_config;
- GLint group_bytes;
- GLint num_channels;
- GLint num_banks;
- GLint r7xx_bank_op;
};
struct radeon_framebuffer
@@ -225,29 +218,7 @@ struct radeon_tex_obj {
GLuint pp_txfilter_1; /* r300 */
- /* r700 texture states */
- GLuint SQ_TEX_RESOURCE0;
- GLuint SQ_TEX_RESOURCE1;
- GLuint SQ_TEX_RESOURCE2;
- GLuint SQ_TEX_RESOURCE3;
- GLuint SQ_TEX_RESOURCE4;
- GLuint SQ_TEX_RESOURCE5;
- GLuint SQ_TEX_RESOURCE6;
-
- GLuint SQ_TEX_RESOURCE7;
-
- GLuint SQ_TEX_SAMPLER0;
- GLuint SQ_TEX_SAMPLER1;
- GLuint SQ_TEX_SAMPLER2;
-
- GLuint TD_PS_SAMPLER0_BORDER_RED;
- GLuint TD_PS_SAMPLER0_BORDER_GREEN;
- GLuint TD_PS_SAMPLER0_BORDER_BLUE;
- GLuint TD_PS_SAMPLER0_BORDER_ALPHA;
-
GLboolean border_fallback;
-
-
};
static INLINE radeonTexObj* radeon_tex_obj(struct gl_texture_object *texObj)
@@ -550,51 +521,6 @@ static inline __DRIdrawable* radeon_get_readable(radeonContextPtr radeon)
return radeon->dri.context->driReadablePriv;
}
-/**
- * This function takes a float and packs it into a uint32_t
- */
-static INLINE uint32_t radeonPackFloat32(float fl)
-{
- union {
- float fl;
- uint32_t u;
- } u;
-
- u.fl = fl;
- return u.u;
-}
-
-/* This is probably wrong for some values, I need to test this
- * some more. Range checking would be a good idea also..
- *
- * But it works for most things. I'll fix it later if someone
- * else with a better clue doesn't
- */
-static INLINE uint32_t radeonPackFloat24(float f)
-{
- float mantissa;
- int exponent;
- uint32_t float24 = 0;
-
- if (f == 0.0)
- return 0;
-
- mantissa = frexpf(f, &exponent);
-
- /* Handle -ve */
- if (mantissa < 0) {
- float24 |= (1 << 23);
- mantissa = mantissa * -1.0;
- }
- /* Handle exponent, bias of 63 */
- exponent += 62;
- float24 |= (exponent << 16);
- /* Kill 7 LSB of mantissa */
- float24 |= (radeonPackFloat32(mantissa) & 0x7FFFFF) >> 7;
-
- return float24;
-}
-
GLboolean radeonInitContext(radeonContextPtr radeon,
struct dd_function_table* functions,
const struct gl_config * glVisual,