summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <[email protected]>2012-07-04 23:34:31 -0400
committerKristian Høgsberg <[email protected]>2012-07-05 14:22:06 -0400
commite408c17767c82c3bbd32d0386d5d9141c1fb20dc (patch)
treeba8deb1b97f19faf2d50a170961259ec90601163
parentbbe92dc6081e5b7106ae8c8fe716d0f5f90f54ce (diff)
intel: Remove unused __DRIimage::data_type field
Signed-off-by: Kristian Høgsberg <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/drivers/dri/intel/intel_regions.h1
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c12
2 files changed, 0 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h
index 2fb30eb48f1..18f8093d13c 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.h
+++ b/src/mesa/drivers/dri/intel/intel_regions.h
@@ -147,7 +147,6 @@ struct __DRIimageRec {
uint32_t usage;
uint32_t dri_format;
GLuint format;
- GLenum data_type;
void *data;
};
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 458178fe927..1cbd249653f 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -194,27 +194,22 @@ intel_create_image_from_name(__DRIscreen *screen,
case __DRI_IMAGE_FORMAT_RGB565:
image->format = MESA_FORMAT_RGB565;
image->internal_format = GL_RGB;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_XRGB8888:
image->format = MESA_FORMAT_XRGB8888;
image->internal_format = GL_RGB;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_ARGB8888:
image->format = MESA_FORMAT_ARGB8888;
image->internal_format = GL_RGBA;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_ABGR8888:
image->format = MESA_FORMAT_RGBA8888_REV;
image->internal_format = GL_RGBA;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_XBGR8888:
image->format = MESA_FORMAT_RGBX8888_REV;
image->internal_format = GL_RGB;
- image->data_type = GL_UNSIGNED_BYTE;
break;
default:
free(image);
@@ -258,7 +253,6 @@ intel_create_image_from_renderbuffer(__DRIcontext *context,
image->internal_format = rb->InternalFormat;
image->format = rb->Format;
- image->data_type = GL_UNSIGNED_BYTE;
image->data = loaderPrivate;
intel_region_reference(&image->region, irb->mt->region);
@@ -321,27 +315,22 @@ intel_create_image(__DRIscreen *screen,
case __DRI_IMAGE_FORMAT_RGB565:
image->format = MESA_FORMAT_RGB565;
image->internal_format = GL_RGB;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_XRGB8888:
image->format = MESA_FORMAT_XRGB8888;
image->internal_format = GL_RGB;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_ARGB8888:
image->format = MESA_FORMAT_ARGB8888;
image->internal_format = GL_RGBA;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_ABGR8888:
image->format = MESA_FORMAT_RGBA8888_REV;
image->internal_format = GL_RGBA;
- image->data_type = GL_UNSIGNED_BYTE;
break;
case __DRI_IMAGE_FORMAT_XBGR8888:
image->format = MESA_FORMAT_RGBX8888_REV;
image->internal_format = GL_RGB;
- image->data_type = GL_UNSIGNED_BYTE;
break;
default:
free(image);
@@ -401,7 +390,6 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate)
image->usage = orig_image->usage;
image->dri_format = orig_image->dri_format;
image->format = orig_image->format;
- image->data_type = orig_image->data_type;
image->data = loaderPrivate;
return image;