summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-07-13 20:07:37 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-07-13 20:07:37 +0000
commitf431a3fb4dc1bf860203d79e54657e3a62bc50df (patch)
tree51a598faf5e8b971b2bd7cf85702e021426f54c6 /src/mesa/drivers
parentbc07a99cc3faeb1aa48700065b34baa76c201e7d (diff)
assorted changes for supporting GLfloat color channels (not done)
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index a0f2823f1d..c1549fdaee 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.61 2001/07/12 22:09:21 keithw Exp $ */
+/* $Id: osmesa.c,v 1.62 2001/07/13 20:07:37 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -650,7 +650,7 @@ do { \
#define PACK_RGB_565(DST, R, G, B) \
do { \
- (DST) = (((R) << 8) & 0xf800) | (((G) << 3) & 0x7e0) | ((B) >> 3);\
+ (DST) = (((int) (R) << 8) & 0xf800) | (((int) (G) << 3) & 0x7e0) | ((int) (B) >> 3);\
} while (0)
@@ -1278,7 +1278,7 @@ read_rgba_pixels3( const GLcontext *ctx,
static void
write_rgba_span2( const GLcontext *ctx,
GLuint n, GLint x, GLint y,
- CONST GLubyte rgba[][4], const GLubyte mask[] )
+ CONST GLchan rgba[][4], const GLubyte mask[] )
{
OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
GLushort *ptr2 = (GLushort *) PIXELADDR2(x, y);
@@ -1302,7 +1302,7 @@ write_rgba_span2( const GLcontext *ctx,
static void
write_rgb_span2( const GLcontext *ctx,
GLuint n, GLint x, GLint y,
- CONST GLubyte rgb[][3], const GLubyte mask[] )
+ CONST GLchan rgb[][3], const GLubyte mask[] )
{
OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
GLushort *ptr2 = (GLushort *) PIXELADDR2(x, y);
@@ -1342,7 +1342,7 @@ write_monocolor_span2( const GLcontext *ctx, GLuint n, GLint x, GLint y,
static void
write_rgba_pixels2( const GLcontext *ctx,
GLuint n, const GLint x[], const GLint y[],
- CONST GLubyte rgba[][4], const GLubyte mask[] )
+ CONST GLchan rgba[][4], const GLubyte mask[] )
{
OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
GLuint i;
@@ -1374,7 +1374,7 @@ write_monocolor_pixels2( const GLcontext *ctx,
static void
read_rgba_span2( const GLcontext *ctx,
GLuint n, GLint x, GLint y,
- GLubyte rgba[][4] )
+ GLchan rgba[][4] )
{
OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
GLuint i;
@@ -1391,7 +1391,7 @@ read_rgba_span2( const GLcontext *ctx,
static void
read_rgba_pixels2( const GLcontext *ctx,
GLuint n, const GLint x[], const GLint y[],
- GLubyte rgba[][4], const GLubyte mask[] )
+ GLchan rgba[][4], const GLubyte mask[] )
{
OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
GLuint i;