From 3a74d3a371acc7b8632885c15ce2f7c05aae94bd Mon Sep 17 00:00:00 2001 From: Gareth Hughes Date: Tue, 6 Mar 2001 04:37:37 +0000 Subject: Merge tdfx-3-1-0 branch. --- linux/radeon_drm.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'linux/radeon_drm.h') diff --git a/linux/radeon_drm.h b/linux/radeon_drm.h index a7d7a71b..50a7d6ed 100644 --- a/linux/radeon_drm.h +++ b/linux/radeon_drm.h @@ -73,7 +73,7 @@ /* Vertex/indirect buffer size */ -#define RADEON_BUFFER_SIZE 16384 +#define RADEON_BUFFER_SIZE 65536 /* Byte offsets for indirect buffer data */ @@ -304,14 +304,20 @@ typedef struct drm_radeon_indices { int discard; /* Client finished with buffer? */ } drm_radeon_indices_t; -typedef struct drm_radeon_blit { - int idx; - int pitch; +typedef struct drm_radeon_tex_image { + unsigned int x, y; /* Blit coordinates */ + unsigned int width, height; + const void *data; +} drm_radeon_tex_image_t; + +typedef struct drm_radeon_texture { int offset; + int pitch; int format; - unsigned short x, y; - unsigned short width, height; -} drm_radeon_blit_t; + int width; /* Texture image coordinates */ + int height; + drm_radeon_tex_image_t *image; +} drm_radeon_texture_t; typedef struct drm_radeon_stipple { unsigned int *mask; -- cgit v1.2.3