head 3.32; access; symbols merge-1:3.25.2.2 autoconf:3.25.0.4 experimental-1:3.25.0.2 mesa-3-1-with-kw3:3.23 mesa-3-1-prior-to-kw3:3.22; locks; strict; comment @ * @; 3.32 date 99.08.01.11.30.56; author brianp; state Exp; branches; next 3.31; 3.31 date 99.07.31.19.58.13; author brianp; state Exp; branches; next 3.30; 3.30 date 99.07.20.00.32.29; author brianp; state Exp; branches; next 3.29; 3.29 date 99.07.12.12.05.25; author keithw; state Exp; branches; next 3.28; 3.28 date 99.06.25.14.08.20; author joukj; state Exp; branches; next 3.27; 3.27 date 99.06.25.01.51.24; author brianp; state Exp; branches; next 3.26; 3.26 date 99.06.16.23.28.14; author brianp; state Exp; branches; next 3.25; 3.25 date 99.03.31.20.18.40; author keithw; state Exp; branches 3.25.2.1; next 3.24; 3.24 date 99.03.28.20.56.15; author brianp; state Exp; branches; next 3.23; 3.23 date 99.02.25.14.12.32; author keithw; state Exp; branches; next 3.22; 3.22 date 99.02.24.22.48.07; author jens; state Exp; branches; next 3.21; 3.21 date 99.02.14.03.46.34; author brianp; state Exp; branches; next 3.20; 3.20 date 99.01.17.21.37.19; author brianp; state Exp; branches; next 3.19; 3.19 date 98.11.25.04.18.19; author brianp; state Exp; branches; next 3.18; 3.18 date 98.11.24.02.34.26; author brianp; state Exp; branches; next 3.17; 3.17 date 98.11.17.02.02.20; author brianp; state Exp; branches; next 3.16; 3.16 date 98.11.08.22.34.07; author brianp; state Exp; branches; next 3.15; 3.15 date 98.10.31.17.06.15; author brianp; state Exp; branches; next 3.14; 3.14 date 98.10.25.18.03.56; author brianp; state Exp; branches; next 3.13; 3.13 date 98.09.25.03.07.34; author brianp; state Exp; branches; next 3.12; 3.12 date 98.09.18.02.32.40; author brianp; state Exp; branches; next 3.11; 3.11 date 98.07.18.03.35.01; author brianp; state Exp; branches; next 3.10; 3.10 date 98.07.17.03.25.17; author brianp; state Exp; branches; next 3.9; 3.9 date 98.05.05.00.28.52; author brianp; state Exp; branches; next 3.8; 3.8 date 98.05.05.00.19.47; author brianp; state Exp; branches; next 3.7; 3.7 date 98.04.20.21.46.08; author brianp; state Exp; branches; next 3.6; 3.6 date 98.04.13.23.16.57; author brianp; state Exp; branches; next 3.5; 3.5 date 98.03.27.04.17.31; author brianp; state Exp; branches; next 3.4; 3.4 date 98.03.03.02.42.38; author brianp; state Exp; branches; next 3.3; 3.3 date 98.02.20.04.53.37; author brianp; state Exp; branches; next 3.2; 3.2 date 98.02.07.14.42.29; author brianp; state Exp; branches; next 3.1; 3.1 date 98.02.01.22.28.41; author brianp; state Exp; branches; next 3.0; 3.0 date 98.01.31.21.04.38; author brianp; state Exp; branches; next ; 3.25.2.1 date 99.05.21.21.29.27; author keithw; state Exp; branches; next 3.25.2.2; 3.25.2.2 date 99.06.06.22.35.54; author keithw; state Exp; branches; next ; desc @texture image functions @ 3.32 log @new args to gl_pack_rgba_span() @ text @/* $Id: teximage.c,v 3.31 1999/07/31 19:58:13 brianp Exp $ */ /* * Mesa 3-D graphics library * Version: 3.1 * * Copyright (C) 1999 Brian Paul All Rights Reserved. * * 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 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 * BRIAN PAUL 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. */ #ifdef PC_HEADER #include "all.h" #else #include #include #include #include #include "context.h" #include "image.h" #include "macros.h" #include "mmath.h" #include "span.h" #include "teximage.h" #include "texstate.h" #include "types.h" #ifdef XFree86Server #include "GL/xf86glx.h" #endif #endif /* * NOTES: * * The internal texture storage convension is an array of N GLubytes * where N = width * height * components. There is no padding. */ /* * Compute log base 2 of n. * If n isn't an exact power of two return -1. * If n<0 return -1. */ static int logbase2( int n ) { GLint i = 1; GLint log2 = 0; if (n<0) { return -1; } while ( n > i ) { i *= 2; log2++; } if (i != n) { return -1; } else { return log2; } } /* * Given an internal texture format enum or 1, 2, 3, 4 return the * corresponding _base_ internal format: GL_ALPHA, GL_LUMINANCE, * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA. Return -1 if * invalid enum. */ static GLint decode_internal_format( GLint format ) { switch (format) { case GL_ALPHA: case GL_ALPHA4: case GL_ALPHA8: case GL_ALPHA12: case GL_ALPHA16: return GL_ALPHA; case 1: case GL_LUMINANCE: case GL_LUMINANCE4: case GL_LUMINANCE8: case GL_LUMINANCE12: case GL_LUMINANCE16: return GL_LUMINANCE; case 2: case GL_LUMINANCE_ALPHA: case GL_LUMINANCE4_ALPHA4: case GL_LUMINANCE6_ALPHA2: case GL_LUMINANCE8_ALPHA8: case GL_LUMINANCE12_ALPHA4: case GL_LUMINANCE12_ALPHA12: case GL_LUMINANCE16_ALPHA16: return GL_LUMINANCE_ALPHA; case GL_INTENSITY: case GL_INTENSITY4: case GL_INTENSITY8: case GL_INTENSITY12: case GL_INTENSITY16: return GL_INTENSITY; case 3: case GL_RGB: case GL_R3_G3_B2: case GL_RGB4: case GL_RGB5: case GL_RGB8: case GL_RGB10: case GL_RGB12: case GL_RGB16: return GL_RGB; case 4: case GL_RGBA: case GL_RGBA2: case GL_RGBA4: case GL_RGB5_A1: case GL_RGBA8: case GL_RGB10_A2: case GL_RGBA12: case GL_RGBA16: return GL_RGBA; case GL_COLOR_INDEX: case GL_COLOR_INDEX1_EXT: case GL_COLOR_INDEX2_EXT: case GL_COLOR_INDEX4_EXT: case GL_COLOR_INDEX8_EXT: case GL_COLOR_INDEX12_EXT: case GL_COLOR_INDEX16_EXT: return GL_COLOR_INDEX; default: return -1; /* error */ } } /* * Given an internal texture format enum or 1, 2, 3, 4 return the * corresponding _base_ internal format: GL_ALPHA, GL_LUMINANCE, * GL_LUMANCE_ALPHA, GL_INTENSITY, GL_RGB, or GL_RGBA. Return the * number of components for the format. Return -1 if invalid enum. */ static GLint components_in_intformat( GLint format ) { switch (format) { case GL_ALPHA: case GL_ALPHA4: case GL_ALPHA8: case GL_ALPHA12: case GL_ALPHA16: return 1; case 1: case GL_LUMINANCE: case GL_LUMINANCE4: case GL_LUMINANCE8: case GL_LUMINANCE12: case GL_LUMINANCE16: return 1; case 2: case GL_LUMINANCE_ALPHA: case GL_LUMINANCE4_ALPHA4: case GL_LUMINANCE6_ALPHA2: case GL_LUMINANCE8_ALPHA8: case GL_LUMINANCE12_ALPHA4: case GL_LUMINANCE12_ALPHA12: case GL_LUMINANCE16_ALPHA16: return 2; case GL_INTENSITY: case GL_INTENSITY4: case GL_INTENSITY8: case GL_INTENSITY12: case GL_INTENSITY16: return 1; case 3: case GL_RGB: case GL_R3_G3_B2: case GL_RGB4: case GL_RGB5: case GL_RGB8: case GL_RGB10: case GL_RGB12: case GL_RGB16: return 3; case 4: case GL_RGBA: case GL_RGBA2: case GL_RGBA4: case GL_RGB5_A1: case GL_RGBA8: case GL_RGB10_A2: case GL_RGBA12: case GL_RGBA16: return 4; case GL_COLOR_INDEX: case GL_COLOR_INDEX1_EXT: case GL_COLOR_INDEX2_EXT: case GL_COLOR_INDEX4_EXT: case GL_COLOR_INDEX8_EXT: case GL_COLOR_INDEX12_EXT: case GL_COLOR_INDEX16_EXT: return 1; default: return -1; /* error */ } } struct gl_texture_image *gl_alloc_texture_image( void ) { return (struct gl_texture_image *) calloc( 1, sizeof(struct gl_texture_image) ); } void gl_free_texture_image( struct gl_texture_image *teximage ) { if (teximage->Data) { free( teximage->Data ); } free( teximage ); } /* * Examine the texImage->Format field and set the Red, Green, Blue, etc * texel component sizes to default values. * These fields are set only here by core Mesa but device drivers may * overwritting these fields to indicate true texel resolution. */ static void set_teximage_component_sizes( struct gl_texture_image *texImage ) { switch (texImage->Format) { case GL_ALPHA: texImage->RedBits = 0; texImage->GreenBits = 0; texImage->BlueBits = 0; texImage->AlphaBits = 8; texImage->IntensityBits = 0; texImage->LuminanceBits = 0; texImage->IndexBits = 0; break; case GL_LUMINANCE: texImage->RedBits = 0; texImage->GreenBits = 0; texImage->BlueBits = 0; texImage->AlphaBits = 0; texImage->IntensityBits = 0; texImage->LuminanceBits = 8; texImage->IndexBits = 0; break; case GL_LUMINANCE_ALPHA: texImage->RedBits = 0; texImage->GreenBits = 0; texImage->BlueBits = 0; texImage->AlphaBits = 8; texImage->IntensityBits = 0; texImage->LuminanceBits = 8; texImage->IndexBits = 0; break; case GL_INTENSITY: texImage->RedBits = 0; texImage->GreenBits = 0; texImage->BlueBits = 0; texImage->AlphaBits = 0; texImage->IntensityBits = 8; texImage->LuminanceBits = 0; texImage->IndexBits = 0; break; case GL_RGB: texImage->RedBits = 8; texImage->GreenBits = 8; texImage->BlueBits = 8; texImage->AlphaBits = 0; texImage->IntensityBits = 0; texImage->LuminanceBits = 0; texImage->IndexBits = 0; break; case GL_RGBA: texImage->RedBits = 8; texImage->GreenBits = 8; texImage->BlueBits = 8; texImage->AlphaBits = 8; texImage->IntensityBits = 0; texImage->LuminanceBits = 0; texImage->IndexBits = 0; break; case GL_COLOR_INDEX: texImage->RedBits = 0; texImage->GreenBits = 0; texImage->BlueBits = 0; texImage->AlphaBits = 0; texImage->IntensityBits = 0; texImage->LuminanceBits = 0; texImage->IndexBits = 8; break; default: gl_problem(NULL, "unexpected format in set_teximage_component_sizes"); } } /* Need this to prevent an out-of-bounds memory access when using * X86 optimized code. */ #ifdef USE_X86_ASM # define EXTRA_BYTE 1 #else # define EXTRA_BYTE 0 #endif /* * Given a gl_image, apply the pixel transfer scale, bias, and mapping * to produce a gl_texture_image. Convert image data to GLubytes. * Input: image - the incoming gl_image * internalFormat - desired format of resultant texture * border - texture border width (0 or 1) * Return: pointer to a gl_texture_image or NULL if an error occurs. */ static struct gl_texture_image * image_to_texture( GLcontext *ctx, const struct gl_image *image, GLint internalFormat, GLint border ) { GLint components; struct gl_texture_image *texImage; GLint numPixels, pixel; GLboolean scaleOrBias; assert(image); assert(image->Width>0); assert(image->Height>0); assert(image->Depth>0); /* internalFormat = decode_internal_format(internalFormat);*/ components = components_in_intformat(internalFormat); numPixels = image->Width * image->Height * image->Depth; texImage = gl_alloc_texture_image(); if (!texImage) return NULL; texImage->Format = (GLenum) decode_internal_format(internalFormat); set_teximage_component_sizes( texImage ); texImage->IntFormat = (GLenum) internalFormat; texImage->Border = border; texImage->Width = image->Width; texImage->Height = image->Height; texImage->Depth = image->Depth; texImage->WidthLog2 = logbase2(image->Width - 2*border); if (image->Height==1) /* 1-D texture */ texImage->HeightLog2 = 0; else texImage->HeightLog2 = logbase2(image->Height - 2*border); if (image->Depth==1) /* 2-D texture */ texImage->DepthLog2 = 0; else texImage->DepthLog2 = logbase2(image->Depth - 2*border); texImage->Width2 = 1 << texImage->WidthLog2; texImage->Height2 = 1 << texImage->HeightLog2; texImage->Depth2 = 1 << texImage->DepthLog2; texImage->MaxLog2 = MAX2( texImage->WidthLog2, texImage->HeightLog2 ); texImage->Data = (GLubyte *) malloc( numPixels * components + EXTRA_BYTE ); if (!texImage->Data) { /* out of memory */ gl_free_texture_image( texImage ); return NULL; } /* Determine if scaling and/or biasing is needed */ if (ctx->Pixel.RedScale!=1.0F || ctx->Pixel.RedBias!=0.0F || ctx->Pixel.GreenScale!=1.0F || ctx->Pixel.GreenBias!=0.0F || ctx->Pixel.BlueScale!=1.0F || ctx->Pixel.BlueBias!=0.0F || ctx->Pixel.AlphaScale!=1.0F || ctx->Pixel.AlphaBias!=0.0F) { scaleOrBias = GL_TRUE; } else { scaleOrBias = GL_FALSE; } switch (image->Type) { case GL_BITMAP: { GLint shift = ctx->Pixel.IndexShift; GLint offset = ctx->Pixel.IndexOffset; /* MapIto[RGBA]Size must be powers of two */ GLint rMask = ctx->Pixel.MapItoRsize-1; GLint gMask = ctx->Pixel.MapItoGsize-1; GLint bMask = ctx->Pixel.MapItoBsize-1; GLint aMask = ctx->Pixel.MapItoAsize-1; GLint i, j; GLubyte *srcPtr = (GLubyte *) image->Data; assert( image->Format==GL_COLOR_INDEX ); for (j=0; jHeight; j++) { GLubyte bitMask = 128; for (i=0; iWidth; i++) { GLint index; GLubyte red, green, blue, alpha; /* Fetch image color index */ index = (*srcPtr & bitMask) ? 1 : 0; bitMask = bitMask >> 1; if (bitMask==0) { bitMask = 128; srcPtr++; } /* apply index shift and offset */ if (shift>=0) { index = (index << shift) + offset; } else { index = (index >> -shift) + offset; } /* convert index to RGBA */ red = (GLint) (ctx->Pixel.MapItoR[index & rMask] * 255.0F); green = (GLint) (ctx->Pixel.MapItoG[index & gMask] * 255.0F); blue = (GLint) (ctx->Pixel.MapItoB[index & bMask] * 255.0F); alpha = (GLint) (ctx->Pixel.MapItoA[index & aMask] * 255.0F); /* store texel (components are GLubytes in [0,255]) */ pixel = j * image->Width + i; switch (texImage->Format) { case GL_ALPHA: texImage->Data[pixel] = alpha; break; case GL_LUMINANCE: texImage->Data[pixel] = red; break; case GL_LUMINANCE_ALPHA: texImage->Data[pixel*2+0] = red; texImage->Data[pixel*2+1] = alpha; break; case GL_INTENSITY: texImage->Data[pixel] = red; break; case GL_RGB: texImage->Data[pixel*3+0] = red; texImage->Data[pixel*3+1] = green; texImage->Data[pixel*3+2] = blue; break; case GL_RGBA: texImage->Data[pixel*4+0] = red; texImage->Data[pixel*4+1] = green; texImage->Data[pixel*4+2] = blue; texImage->Data[pixel*4+3] = alpha; break; default: gl_problem(ctx,"Bad format in image_to_texture"); return NULL; } } if (bitMask!=128) { srcPtr++; } } } break; case GL_UNSIGNED_BYTE: if (image->Format == texImage->Format && !scaleOrBias && !ctx->Pixel.MapColorFlag) { switch (image->Format) { case GL_COLOR_INDEX: if (decode_internal_format(internalFormat)!=GL_COLOR_INDEX) { /* convert color index to RGBA */ for (pixel=0; pixelData)[pixel]; index = (GLint) (255.0F * ctx->Pixel.MapItoR[index]); texImage->Data[pixel] = index; } numPixels = 0; break; } case GL_ALPHA: case GL_LUMINANCE: case GL_INTENSITY: MEMCPY(texImage->Data, image->Data, numPixels * 1); numPixels = 0; break; case GL_LUMINANCE_ALPHA: MEMCPY(texImage->Data, image->Data, numPixels * 2); numPixels = 0; break; case GL_RGB: MEMCPY(texImage->Data, image->Data, numPixels * 3); numPixels = 0; break; case GL_RGBA: MEMCPY(texImage->Data, image->Data, numPixels * 4); numPixels = 0; break; default: break; } } for (pixel=0; pixelFormat) { case GL_COLOR_INDEX: if (decode_internal_format(internalFormat)==GL_COLOR_INDEX) { /* a paletted texture */ GLint index = ((GLubyte*)image->Data)[pixel]; red = index; } else { /* convert color index to RGBA */ GLint index = ((GLubyte*)image->Data)[pixel]; red = (GLint) (255.0F * ctx->Pixel.MapItoR[index]); green = (GLint) (255.0F * ctx->Pixel.MapItoG[index]); blue = (GLint) (255.0F * ctx->Pixel.MapItoB[index]); alpha = (GLint) (255.0F * ctx->Pixel.MapItoA[index]); } break; case GL_RGB: /* Fetch image RGBA values */ red = ((GLubyte*) image->Data)[pixel*3+0]; green = ((GLubyte*) image->Data)[pixel*3+1]; blue = ((GLubyte*) image->Data)[pixel*3+2]; alpha = 255; break; case GL_RGBA: red = ((GLubyte*) image->Data)[pixel*4+0]; green = ((GLubyte*) image->Data)[pixel*4+1]; blue = ((GLubyte*) image->Data)[pixel*4+2]; alpha = ((GLubyte*) image->Data)[pixel*4+3]; break; case GL_RED: red = ((GLubyte*) image->Data)[pixel]; green = 0; blue = 0; alpha = 255; break; case GL_GREEN: red = 0; green = ((GLubyte*) image->Data)[pixel]; blue = 0; alpha = 255; break; case GL_BLUE: red = 0; green = 0; blue = ((GLubyte*) image->Data)[pixel]; alpha = 255; break; case GL_ALPHA: red = 0; green = 0; blue = 0; alpha = ((GLubyte*) image->Data)[pixel]; break; case GL_LUMINANCE: red = ((GLubyte*) image->Data)[pixel]; green = red; blue = red; alpha = 255; break; case GL_LUMINANCE_ALPHA: red = ((GLubyte*) image->Data)[pixel*2+0]; green = red; blue = red; alpha = ((GLubyte*) image->Data)[pixel*2+1]; break; default: gl_problem(ctx,"Bad format (2) in image_to_texture"); return NULL; } if (scaleOrBias || ctx->Pixel.MapColorFlag) { /* Apply RGBA scale and bias */ GLfloat r = UBYTE_COLOR_TO_FLOAT_COLOR(red); GLfloat g = UBYTE_COLOR_TO_FLOAT_COLOR(green); GLfloat b = UBYTE_COLOR_TO_FLOAT_COLOR(blue); GLfloat a = UBYTE_COLOR_TO_FLOAT_COLOR(alpha); if (scaleOrBias) { /* r,g,b,a now in [0,1] */ r = r * ctx->Pixel.RedScale + ctx->Pixel.RedBias; g = g * ctx->Pixel.GreenScale + ctx->Pixel.GreenBias; b = b * ctx->Pixel.BlueScale + ctx->Pixel.BlueBias; a = a * ctx->Pixel.AlphaScale + ctx->Pixel.AlphaBias; r = CLAMP( r, 0.0F, 1.0F ); g = CLAMP( g, 0.0F, 1.0F ); b = CLAMP( b, 0.0F, 1.0F ); a = CLAMP( a, 0.0F, 1.0F ); } /* Apply pixel maps */ if (ctx->Pixel.MapColorFlag) { GLint ir = (GLint) (r*ctx->Pixel.MapRtoRsize); GLint ig = (GLint) (g*ctx->Pixel.MapGtoGsize); GLint ib = (GLint) (b*ctx->Pixel.MapBtoBsize); GLint ia = (GLint) (a*ctx->Pixel.MapAtoAsize); r = ctx->Pixel.MapRtoR[ir]; g = ctx->Pixel.MapGtoG[ig]; b = ctx->Pixel.MapBtoB[ib]; a = ctx->Pixel.MapAtoA[ia]; } red = (GLint) (r * 255.0F); green = (GLint) (g * 255.0F); blue = (GLint) (b * 255.0F); alpha = (GLint) (a * 255.0F); } /* store texel (components are GLubytes in [0,255]) */ switch (texImage->Format) { case GL_COLOR_INDEX: texImage->Data[pixel] = red; /* really an index */ break; case GL_ALPHA: texImage->Data[pixel] = alpha; break; case GL_LUMINANCE: texImage->Data[pixel] = red; break; case GL_LUMINANCE_ALPHA: texImage->Data[pixel*2+0] = red; texImage->Data[pixel*2+1] = alpha; break; case GL_INTENSITY: texImage->Data[pixel] = red; break; case GL_RGB: texImage->Data[pixel*3+0] = red; texImage->Data[pixel*3+1] = green; texImage->Data[pixel*3+2] = blue; break; case GL_RGBA: texImage->Data[pixel*4+0] = red; texImage->Data[pixel*4+1] = green; texImage->Data[pixel*4+2] = blue; texImage->Data[pixel*4+3] = alpha; break; default: gl_problem(ctx,"Bad format (3) in image_to_texture"); return NULL; } } break; case GL_FLOAT: for (pixel=0; pixelFormat) { case GL_COLOR_INDEX: if (decode_internal_format(internalFormat)==GL_COLOR_INDEX) { /* a paletted texture */ GLint index = (GLint) ((GLfloat*) image->Data)[pixel]; red = index; } else { GLint shift = ctx->Pixel.IndexShift; GLint offset = ctx->Pixel.IndexOffset; /* MapIto[RGBA]Size must be powers of two */ GLint rMask = ctx->Pixel.MapItoRsize-1; GLint gMask = ctx->Pixel.MapItoGsize-1; GLint bMask = ctx->Pixel.MapItoBsize-1; GLint aMask = ctx->Pixel.MapItoAsize-1; /* Fetch image color index */ GLint index = (GLint) ((GLfloat*) image->Data)[pixel]; /* apply index shift and offset */ if (shift>=0) { index = (index << shift) + offset; } else { index = (index >> -shift) + offset; } /* convert index to RGBA */ red = ctx->Pixel.MapItoR[index & rMask]; green = ctx->Pixel.MapItoG[index & gMask]; blue = ctx->Pixel.MapItoB[index & bMask]; alpha = ctx->Pixel.MapItoA[index & aMask]; } break; case GL_RGB: /* Fetch image RGBA values */ red = ((GLfloat*) image->Data)[pixel*3+0]; green = ((GLfloat*) image->Data)[pixel*3+1]; blue = ((GLfloat*) image->Data)[pixel*3+2]; alpha = 1.0; break; case GL_RGBA: red = ((GLfloat*) image->Data)[pixel*4+0]; green = ((GLfloat*) image->Data)[pixel*4+1]; blue = ((GLfloat*) image->Data)[pixel*4+2]; alpha = ((GLfloat*) image->Data)[pixel*4+3]; break; case GL_RED: red = ((GLfloat*) image->Data)[pixel]; green = 0.0; blue = 0.0; alpha = 1.0; break; case GL_GREEN: red = 0.0; green = ((GLfloat*) image->Data)[pixel]; blue = 0.0; alpha = 1.0; break; case GL_BLUE: red = 0.0; green = 0.0; blue = ((GLfloat*) image->Data)[pixel]; alpha = 1.0; break; case GL_ALPHA: red = 0.0; green = 0.0; blue = 0.0; alpha = ((GLfloat*) image->Data)[pixel]; break; case GL_LUMINANCE: red = ((GLfloat*) image->Data)[pixel]; green = red; blue = red; alpha = 1.0; break; case GL_LUMINANCE_ALPHA: red = ((GLfloat*) image->Data)[pixel*2+0]; green = red; blue = red; alpha = ((GLfloat*) image->Data)[pixel*2+1]; break; default: gl_problem(ctx,"Bad format (4) in image_to_texture"); return NULL; } if (image->Format!=GL_COLOR_INDEX) { /* Apply RGBA scale and bias */ if (scaleOrBias) { red = red * ctx->Pixel.RedScale + ctx->Pixel.RedBias; green = green * ctx->Pixel.GreenScale + ctx->Pixel.GreenBias; blue = blue * ctx->Pixel.BlueScale + ctx->Pixel.BlueBias; alpha = alpha * ctx->Pixel.AlphaScale + ctx->Pixel.AlphaBias; red = CLAMP( red, 0.0F, 1.0F ); green = CLAMP( green, 0.0F, 1.0F ); blue = CLAMP( blue, 0.0F, 1.0F ); alpha = CLAMP( alpha, 0.0F, 1.0F ); } /* Apply pixel maps */ if (ctx->Pixel.MapColorFlag) { GLint ir = (GLint) (red *ctx->Pixel.MapRtoRsize); GLint ig = (GLint) (green*ctx->Pixel.MapGtoGsize); GLint ib = (GLint) (blue *ctx->Pixel.MapBtoBsize); GLint ia = (GLint) (alpha*ctx->Pixel.MapAtoAsize); red = ctx->Pixel.MapRtoR[ir]; green = ctx->Pixel.MapGtoG[ig]; blue = ctx->Pixel.MapBtoB[ib]; alpha = ctx->Pixel.MapAtoA[ia]; } } /* store texel (components are GLubytes in [0,255]) */ switch (texImage->Format) { case GL_COLOR_INDEX: /* a paletted texture */ texImage->Data[pixel] = (GLint) (red * 255.0F); break; case GL_ALPHA: texImage->Data[pixel] = (GLint) (alpha * 255.0F); break; case GL_LUMINANCE: texImage->Data[pixel] = (GLint) (red * 255.0F); break; case GL_LUMINANCE_ALPHA: texImage->Data[pixel*2+0] = (GLint) (red * 255.0F); texImage->Data[pixel*2+1] = (GLint) (alpha * 255.0F); break; case GL_INTENSITY: texImage->Data[pixel] = (GLint) (red * 255.0F); break; case GL_RGB: texImage->Data[pixel*3+0] = (GLint) (red * 255.0F); texImage->Data[pixel*3+1] = (GLint) (green * 255.0F); texImage->Data[pixel*3+2] = (GLint) (blue * 255.0F); break; case GL_RGBA: texImage->Data[pixel*4+0] = (GLint) (red * 255.0F); texImage->Data[pixel*4+1] = (GLint) (green * 255.0F); texImage->Data[pixel*4+2] = (GLint) (blue * 255.0F); texImage->Data[pixel*4+3] = (GLint) (alpha * 255.0F); break; default: gl_problem(ctx,"Bad format (5) in image_to_texture"); return NULL; } } break; default: gl_problem(ctx, "Bad image type in image_to_texture"); return NULL; } return texImage; } /* * glTexImage[123]D can accept a NULL image pointer. In this case we * create a texture image with unspecified image contents per the OpenGL * spec. */ static struct gl_texture_image * make_null_texture( GLcontext *ctx, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border ) { GLint components; struct gl_texture_image *texImage; GLint numPixels; (void) ctx; /*internalFormat = decode_internal_format(internalFormat);*/ components = components_in_intformat(internalFormat); numPixels = width * height * depth; texImage = gl_alloc_texture_image(); if (!texImage) return NULL; texImage->Format = (GLenum) decode_internal_format(internalFormat); set_teximage_component_sizes( texImage ); texImage->IntFormat = internalFormat; texImage->Border = border; texImage->Width = width; texImage->Height = height; texImage->Depth = depth; texImage->WidthLog2 = logbase2(width - 2*border); if (height==1) /* 1-D texture */ texImage->HeightLog2 = 0; else texImage->HeightLog2 = logbase2(height - 2*border); if (depth==1) /* 2-D texture */ texImage->DepthLog2 = 0; else texImage->DepthLog2 = logbase2(depth - 2*border); texImage->Width2 = 1 << texImage->WidthLog2; texImage->Height2 = 1 << texImage->HeightLog2; texImage->Depth2 = 1 << texImage->DepthLog2; texImage->MaxLog2 = MAX2( texImage->WidthLog2, texImage->HeightLog2 ); /* XXX should we really allocate memory for the image or let it be NULL? */ /*texImage->Data = NULL;*/ texImage->Data = (GLubyte *) malloc( numPixels * components + EXTRA_BYTE ); /* * Let's see if anyone finds this. If glTexImage2D() is called with * a NULL image pointer then load the texture image with something * interesting instead of leaving it indeterminate. */ if (texImage->Data) { char message[8][32] = { " X X XXXXX XXX X ", " XX XX X X X X X ", " X X X X X X X ", " X X XXXX XXX XXXXX ", " X X X X X X ", " X X X X X X X ", " X X XXXXX XXX X X ", " " }; GLubyte *imgPtr = texImage->Data; GLint i, j, k; for (i=0;i 2 + ctx->Const.MaxTextureSize || logbase2( width - 2 * border ) < 0) { if (!isProxy) { if (dimensions == 1) gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(width)" ); else if (dimensions == 2) gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(width)" ); else if (dimensions == 3) gl_error( ctx, GL_INVALID_VALUE, "glTexImage3D(width)" ); } return GL_TRUE; } /* Height */ if (dimensions >= 2) { if (height < 2 * border || height > 2 + ctx->Const.MaxTextureSize || logbase2( height - 2 * border ) < 0) { if (!isProxy) { if (dimensions == 2) gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(height)" ); else if (dimensions == 3) gl_error( ctx, GL_INVALID_VALUE, "glTexImage3D(height)" ); return GL_TRUE; } } } /* Depth */ if (dimensions >= 3) { if (depth < 2 * border || depth > 2 + ctx->Const.MaxTextureSize || logbase2( depth - 2 * border ) < 0) { if (!isProxy) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage3D(depth)" ); } return GL_TRUE; } } /* Level */ if (level<0 || level>=ctx->Const.MaxTextureLevels) { if (dimensions == 1) gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(level)" ); else if (dimensions == 2) gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(level)" ); else if (dimensions == 3) gl_error( ctx, GL_INVALID_VALUE, "glTexImage3D(level)" ); return GL_TRUE; } iformat = decode_internal_format( internalFormat ); if (iformat < 0) { if (dimensions == 1) gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(internalFormat)" ); else if (dimensions == 2) gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(internalFormat)" ); else if (dimensions == 3) gl_error( ctx, GL_INVALID_VALUE, "glTexImage3D(internalFormat)" ); return GL_TRUE; } if (!gl_is_legal_format_and_type( format, type )) { if (dimensions == 1) gl_error( ctx, GL_INVALID_ENUM, "glTexImage1D(format or type)"); else if (dimensions == 2) gl_error( ctx, GL_INVALID_ENUM, "glTexImage2D(format or type)"); else if (dimensions == 3) gl_error( ctx, GL_INVALID_ENUM, "glTexImage3D(format or type)"); return GL_TRUE; } /* if we get here, the parameters are OK */ return GL_FALSE; } /* * Called from the API. Note that width includes the border. */ void gl_TexImage1D( GLcontext *ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, struct gl_image *image ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexImage1D"); if (target==GL_TEXTURE_1D) { struct gl_texture_image *teximage; if (texture_error_check( ctx, target, level, internalformat, format, type, 1, width, 1, 1, border )) { /* error in texture image was detected */ return; } /* free current texture image, if any */ if (texUnit->CurrentD[1]->Image[level]) { gl_free_texture_image( texUnit->CurrentD[1]->Image[level] ); } /* make new texture from source image */ if (image) { teximage = image_to_texture(ctx, image, internalformat, border); } else { teximage = make_null_texture(ctx, (GLenum) internalformat, width, 1, 1, border); } /* install new texture image */ texUnit->CurrentD[1]->Image[level] = teximage; gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[1] ); ctx->NewState |= NEW_TEXTURING; /* free the source image */ if (image && image->RefCount==0) { /* if RefCount>0 then image must be in a display list */ gl_free_image(image); } /* tell driver about change */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], level, internalformat, teximage ); } } else if (target==GL_PROXY_TEXTURE_1D) { /* Proxy texture: check for errors and update proxy state */ if (texture_error_check( ctx, target, level, internalformat, format, type, 1, width, 1, 1, border )) { if (level>=0 && levelConst.MaxTextureLevels) { MEMSET( ctx->Texture.Proxy1D->Image[level], 0, sizeof(struct gl_texture_image) ); } } else { ctx->Texture.Proxy1D->Image[level]->Format = (GLenum) format; set_teximage_component_sizes( ctx->Texture.Proxy1D->Image[level] ); ctx->Texture.Proxy1D->Image[level]->IntFormat = (GLenum) internalformat; ctx->Texture.Proxy1D->Image[level]->Border = border; ctx->Texture.Proxy1D->Image[level]->Width = width; ctx->Texture.Proxy1D->Image[level]->Height = 1; ctx->Texture.Proxy1D->Image[level]->Depth = 1; } if (image && image->RefCount==0) { /* if RefCount>0 then image must be in a display list */ gl_free_image(image); } } else { gl_error( ctx, GL_INVALID_ENUM, "glTexImage1D(target)" ); return; } } /* * Called by the API or display list executor. * Note that width and height include the border. */ void gl_TexImage2D( GLcontext *ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, struct gl_image *image ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexImage2D"); if (target==GL_TEXTURE_2D) { struct gl_texture_image *teximage; if (texture_error_check( ctx, target, level, internalformat, format, type, 2, width, height, 1, border )) { /* error in texture image was detected */ return; } /* free current texture image, if any */ if (texUnit->CurrentD[2]->Image[level]) { gl_free_texture_image( texUnit->CurrentD[2]->Image[level] ); } /* make new texture from source image */ if (image) { teximage = image_to_texture(ctx, image, internalformat, border); } else { teximage = make_null_texture(ctx, (GLenum) internalformat, width, height, 1, border); } /* install new texture image */ texUnit->CurrentD[2]->Image[level] = teximage; gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[2] ); ctx->NewState |= NEW_TEXTURING; /* free the source image */ if (image && image->RefCount==0) { /* if RefCount>0 then image must be in a display list */ gl_free_image(image); } /* tell driver about change */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, internalformat, teximage ); } } else if (target==GL_PROXY_TEXTURE_2D) { /* Proxy texture: check for errors and update proxy state */ if (texture_error_check( ctx, target, level, internalformat, format, type, 2, width, height, 1, border )) { if (level>=0 && levelConst.MaxTextureLevels) { MEMSET( ctx->Texture.Proxy2D->Image[level], 0, sizeof(struct gl_texture_image) ); } } else { ctx->Texture.Proxy2D->Image[level]->Format = (GLenum) format; set_teximage_component_sizes( ctx->Texture.Proxy2D->Image[level] ); ctx->Texture.Proxy2D->Image[level]->IntFormat = (GLenum) internalformat; ctx->Texture.Proxy2D->Image[level]->Border = border; ctx->Texture.Proxy2D->Image[level]->Width = width; ctx->Texture.Proxy2D->Image[level]->Height = height; ctx->Texture.Proxy2D->Image[level]->Depth = 1; } if (image && image->RefCount==0) { /* if RefCount>0 then image must be in a display list */ gl_free_image(image); } } else { gl_error( ctx, GL_INVALID_ENUM, "glTexImage2D(target)" ); return; } } /* * Called by the API or display list executor. * Note that width and height include the border. */ void gl_TexImage3DEXT( GLcontext *ctx, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, struct gl_image *image ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexImage3DEXT"); if (target==GL_TEXTURE_3D_EXT) { struct gl_texture_image *teximage; if (texture_error_check( ctx, target, level, internalformat, format, type, 3, width, height, depth, border )) { /* error in texture image was detected */ return; } /* free current texture image, if any */ if (texUnit->CurrentD[3]->Image[level]) { gl_free_texture_image( texUnit->CurrentD[3]->Image[level] ); } /* make new texture from source image */ if (image) { teximage = image_to_texture(ctx, image, internalformat, border); } else { teximage = make_null_texture(ctx, (GLenum) internalformat, width, height, depth, border); } /* install new texture image */ texUnit->CurrentD[3]->Image[level] = teximage; gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[3] ); ctx->NewState |= NEW_TEXTURING; /* free the source image */ if (image && image->RefCount==0) { /* if RefCount>0 then image must be in a display list */ gl_free_image(image); } /* tell driver about change */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texUnit->CurrentD[3], level, internalformat, teximage ); } } else if (target==GL_PROXY_TEXTURE_3D_EXT) { /* Proxy texture: check for errors and update proxy state */ if (texture_error_check( ctx, target, level, internalformat, format, type, 3, width, height, depth, border )) { if (level>=0 && levelConst.MaxTextureLevels) { MEMSET( ctx->Texture.Proxy3D->Image[level], 0, sizeof(struct gl_texture_image) ); } } else { ctx->Texture.Proxy3D->Image[level]->Format = (GLenum) format; set_teximage_component_sizes( ctx->Texture.Proxy3D->Image[level] ); ctx->Texture.Proxy3D->Image[level]->IntFormat = (GLenum) internalformat; ctx->Texture.Proxy3D->Image[level]->Border = border; ctx->Texture.Proxy3D->Image[level]->Width = width; ctx->Texture.Proxy3D->Image[level]->Height = height; ctx->Texture.Proxy3D->Image[level]->Depth = depth; } if (image && image->RefCount==0) { /* if RefCount>0 then image must be in a display list */ gl_free_image(image); } } else { gl_error( ctx, GL_INVALID_ENUM, "glTexImage3DEXT(target)" ); return; } } void gl_GetTexImage( GLcontext *ctx, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels ) { const struct gl_texture_object *texObj; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexImage"); if (level < 0 || level >= ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" ); return; } if (gl_sizeof_type(type) <= 0) { gl_error( ctx, GL_INVALID_ENUM, "glGetTexImage(type)" ); return; } if (gl_components_in_format(format) <= 0) { gl_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" ); return; } if (!pixels) return; /* XXX generate an error??? */ switch (target) { case GL_TEXTURE_1D: texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[1]; break; case GL_TEXTURE_2D: texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[2]; break; case GL_TEXTURE_3D: texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[3]; break; default: gl_error( ctx, GL_INVALID_ENUM, "glGetTexImage(target)" ); return; } if (texObj->Image[level] && texObj->Image[level]->Data) { const struct gl_texture_image *texImage = texObj->Image[level]; GLint width = texImage->Width; GLint height = texImage->Height; GLint row; for (row = 0; row < height; row++) { /* compute destination address in client memory */ GLvoid *dest = gl_pixel_addr_in_image( &ctx->Unpack, pixels, width, height, format, type, 0, row, 0); assert(dest); if (texImage->Format == GL_RGBA) { const GLubyte *src = texImage->Data + row * width * 4 * sizeof(GLubyte); gl_pack_rgba_span( ctx, width, (void *) src, format, type, dest, &ctx->Pack, GL_TRUE ); } else { /* fetch RGBA row from texture image then pack it in client mem */ GLubyte rgba[MAX_WIDTH][4]; GLint i; const GLubyte *src; switch (texImage->Format) { case GL_ALPHA: src = texImage->Data + row * width * sizeof(GLubyte); for (i = 0; i < width; i++) { rgba[i][RCOMP] = 255; rgba[i][GCOMP] = 255; rgba[i][BCOMP] = 255; rgba[i][ACOMP] = src[i]; } break; case GL_LUMINANCE: src = texImage->Data + row * width * sizeof(GLubyte); for (i = 0; i < width; i++) { rgba[i][RCOMP] = src[i]; rgba[i][GCOMP] = src[i]; rgba[i][BCOMP] = src[i]; rgba[i][ACOMP] = 255; } break; case GL_LUMINANCE_ALPHA: src = texImage->Data + row * 2 * width * sizeof(GLubyte); for (i = 0; i < width; i++) { rgba[i][RCOMP] = src[i*2+0]; rgba[i][GCOMP] = src[i*2+0]; rgba[i][BCOMP] = src[i*2+0]; rgba[i][ACOMP] = src[i*2+1]; } break; case GL_INTENSITY: src = texImage->Data + row * width * sizeof(GLubyte); for (i = 0; i < width; i++) { rgba[i][RCOMP] = src[i]; rgba[i][GCOMP] = src[i]; rgba[i][BCOMP] = src[i]; rgba[i][ACOMP] = 255; } break; case GL_RGB: src = texImage->Data + row * 3 * width * sizeof(GLubyte); for (i = 0; i < width; i++) { rgba[i][RCOMP] = src[i*3+0]; rgba[i][GCOMP] = src[i*3+1]; rgba[i][BCOMP] = src[i*3+2]; rgba[i][ACOMP] = 255; } break; case GL_RGBA: /* this special case should have been handled above! */ gl_problem( ctx, "error 1 in gl_GetTexImage" ); break; case GL_COLOR_INDEX: gl_problem( ctx, "GL_COLOR_INDEX not implemented in gl_GetTexImage" ); break; default: gl_problem( ctx, "bad format in gl_GetTexImage" ); } gl_pack_rgba_span( ctx, width, (const GLubyte (*)[4])rgba, format, type, dest, &ctx->Pack, GL_TRUE ); } } } } /* * Unpack the image data given to glTexSubImage[12]D. * This function is just a wrapper for gl_unpack_image() but it does * some extra error checking. */ struct gl_image * gl_unpack_texsubimage( GLcontext *ctx, GLint width, GLint height, GLenum format, GLenum type, const GLvoid *pixels ) { if (type==GL_BITMAP && format!=GL_COLOR_INDEX) { return NULL; } if (format==GL_STENCIL_INDEX || format==GL_DEPTH_COMPONENT){ return NULL; } if (gl_sizeof_type(type)<=0) { return NULL; } return gl_unpack_image3D( ctx, width, height, 1, format, type, pixels, &ctx->Unpack ); } /* * Unpack the image data given to glTexSubImage3D. * This function is just a wrapper for gl_unpack_image() but it does * some extra error checking. */ struct gl_image * gl_unpack_texsubimage3D( GLcontext *ctx, GLint width, GLint height, GLint depth, GLenum format, GLenum type, const GLvoid *pixels ) { if (type==GL_BITMAP && format!=GL_COLOR_INDEX) { return NULL; } if (format==GL_STENCIL_INDEX || format==GL_DEPTH_COMPONENT){ return NULL; } if (gl_sizeof_type(type)<=0) { return NULL; } return gl_unpack_image3D( ctx, width, height, depth, format, type, pixels, &ctx->Unpack ); } void gl_TexSubImage1D( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, struct gl_image *image ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_image *destTex; if (target!=GL_TEXTURE_1D) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(level)" ); return; } destTex = texUnit->CurrentD[1]->Image[level]; if (!destTex) { gl_error( ctx, GL_INVALID_OPERATION, "glTexSubImage1D" ); return; } if (xoffset < -((GLint)destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage1D(xoffset)" ); return; } if (xoffset + width > (GLint) (destTex->Width + destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage1D(xoffset+width)" ); return; } if (image) { /* unpacking must have been error-free */ GLint texcomponents = components_in_intformat(destTex->Format); if (image->Type==GL_UNSIGNED_BYTE && texcomponents==image->Components) { /* Simple case, just byte copy image data into texture image */ /* row by row. */ GLubyte *dst = destTex->Data + texcomponents * xoffset; GLubyte *src = (GLubyte *) image->Data; MEMCPY( dst, src, width * texcomponents ); } else { /* General case, convert image pixels into texels, scale, bias, etc */ struct gl_texture_image *subTexImg = image_to_texture(ctx, image, destTex->IntFormat, destTex->Border); GLubyte *dst = destTex->Data + texcomponents * xoffset; GLubyte *src = subTexImg->Data; MEMCPY( dst, src, width * texcomponents ); gl_free_texture_image(subTexImg); } /* if the image's reference count is zero, delete it now */ if (image->RefCount==0) { gl_free_image(image); } gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[1] ); /* tell driver about change */ if (ctx->Driver.TexSubImage) { (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], level, xoffset,0,width,1, texUnit->CurrentD[1]->Image[level]->IntFormat, destTex ); } else { if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], level, texUnit->CurrentD[1]->Image[level]->IntFormat, destTex ); } } } else { /* if no image, an error must have occured, do more testing now */ GLint components, size; if (width<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage1D(width)" ); return; } if (type==GL_BITMAP && format!=GL_COLOR_INDEX) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(format)" ); return; } components = components_in_intformat( format ); if (components<0 || format==GL_STENCIL_INDEX || format==GL_DEPTH_COMPONENT){ gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(format)" ); return; } size = gl_sizeof_type( type ); if (size<=0) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(type)" ); return; } /* if we get here, probably ran out of memory during unpacking */ gl_error( ctx, GL_OUT_OF_MEMORY, "glTexSubImage1D" ); } } void gl_TexSubImage2D( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, struct gl_image *image ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_image *destTex; if (target!=GL_TEXTURE_2D) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(level)" ); return; } destTex = texUnit->CurrentD[2]->Image[level]; if (!destTex) { gl_error( ctx, GL_INVALID_OPERATION, "glTexSubImage2D" ); return; } if (xoffset < -((GLint)destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage2D(xoffset)" ); return; } if (yoffset < -((GLint)destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage2D(yoffset)" ); return; } if (xoffset + width > (GLint) (destTex->Width + destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage2D(xoffset+width)" ); return; } if (yoffset + height > (GLint) (destTex->Height + destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage2D(yoffset+height)" ); return; } if (image) { /* unpacking must have been error-free */ GLint texcomponents = components_in_intformat(destTex->Format); if (image->Type==GL_UNSIGNED_BYTE && texcomponents==image->Components) { /* Simple case, just byte copy image data into texture image */ /* row by row. */ GLubyte *dst = destTex->Data + (yoffset * destTex->Width + xoffset) * texcomponents; GLubyte *src = (GLubyte *) image->Data; GLint j; for (j=0;jWidth * texcomponents * sizeof(GLubyte); src += width * texcomponents * sizeof(GLubyte); } } else { /* General case, convert image pixels into texels, scale, bias, etc */ struct gl_texture_image *subTexImg = image_to_texture(ctx, image, destTex->IntFormat, destTex->Border); GLubyte *dst = destTex->Data + (yoffset * destTex->Width + xoffset) * texcomponents; GLubyte *src = subTexImg->Data; GLint j; for (j=0;jWidth * texcomponents * sizeof(GLubyte); src += width * texcomponents * sizeof(GLubyte); } gl_free_texture_image(subTexImg); } /* if the image's reference count is zero, delete it now */ if (image->RefCount==0) { gl_free_image(image); } gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[2] ); /* tell driver about change */ if (ctx->Driver.TexSubImage) { (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, xoffset, yoffset, width, height, texUnit->CurrentD[2]->Image[level]->IntFormat, destTex ); } else { if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, texUnit->CurrentD[2]->Image[level]->IntFormat, destTex ); } } } else { /* if no image, an error must have occured, do more testing now */ GLint components, size; if (width<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage2D(width)" ); return; } if (height<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage2D(height)" ); return; } if (type==GL_BITMAP && format!=GL_COLOR_INDEX) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage1D(format)" ); return; } components = gl_components_in_format( format ); if (components<0 || format==GL_STENCIL_INDEX || format==GL_DEPTH_COMPONENT){ gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(format)" ); return; } size = gl_sizeof_packed_type( type ); if (size<=0) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage2D(type)" ); return; } /* if we get here, probably ran out of memory during unpacking */ gl_error( ctx, GL_OUT_OF_MEMORY, "glTexSubImage2D" ); } } void gl_TexSubImage3DEXT( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, struct gl_image *image ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_image *destTex; if (target!=GL_TEXTURE_3D_EXT) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage3DEXT(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage3DEXT(level)" ); return; } destTex = texUnit->CurrentD[3]->Image[level]; if (!destTex) { gl_error( ctx, GL_INVALID_OPERATION, "glTexSubImage3DEXT" ); return; } if (xoffset < -((GLint)destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(xoffset)" ); return; } if (yoffset < -((GLint)destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(yoffset)" ); return; } if (zoffset < -((GLint)destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(zoffset)" ); return; } if (xoffset + width > (GLint) (destTex->Width+destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(xoffset+width)" ); return; } if (yoffset + height > (GLint) (destTex->Height+destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(yoffset+height)" ); return; } if (zoffset + depth > (GLint) (destTex->Depth+destTex->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(zoffset+depth)" ); return; } if (image) { /* unpacking must have been error-free */ GLint texcomponents = components_in_intformat(destTex->Format); GLint dstRectArea = destTex->Width * destTex->Height; GLint srcRectArea = width * height; if (image->Type==GL_UNSIGNED_BYTE && texcomponents==image->Components) { /* Simple case, just byte copy image data into texture image */ /* row by row. */ GLubyte *dst = destTex->Data + (zoffset * dstRectArea + yoffset * destTex->Width + xoffset) * texcomponents; GLubyte *src = (GLubyte *) image->Data; GLint j, k; for(k=0;kWidth * texcomponents; src += width * texcomponents; } dst += dstRectArea * texcomponents * sizeof(GLubyte); src += srcRectArea * texcomponents * sizeof(GLubyte); } } else { /* General case, convert image pixels into texels, scale, bias, etc */ struct gl_texture_image *subTexImg = image_to_texture(ctx, image, destTex->IntFormat, destTex->Border); GLubyte *dst = destTex->Data + (zoffset * dstRectArea + yoffset * destTex->Width + xoffset) * texcomponents; GLubyte *src = subTexImg->Data; GLint j, k; for(k=0;kWidth * texcomponents; src += width * texcomponents; } dst += dstRectArea * texcomponents * sizeof(GLubyte); src += srcRectArea * texcomponents * sizeof(GLubyte); } gl_free_texture_image(subTexImg); } /* if the image's reference count is zero, delete it now */ if (image->RefCount==0) { gl_free_image(image); } gl_put_texobj_on_dirty_list( ctx, texUnit->CurrentD[3] ); /* tell driver about change */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texUnit->CurrentD[3], level, texUnit->CurrentD[3]->Image[level]->IntFormat, destTex ); } } else { /* if no image, an error must have occured, do more testing now */ GLint components, size; if (width<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(width)" ); return; } if (height<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(height)" ); return; } if (depth<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexSubImage3DEXT(depth)" ); return; } if (type==GL_BITMAP && format!=GL_COLOR_INDEX) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage3DEXT(format)" ); return; } components = components_in_intformat( format ); if (components<0 || format==GL_STENCIL_INDEX || format==GL_DEPTH_COMPONENT){ gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage3DEXT(format)" ); return; } size = gl_sizeof_type( type ); if (size<=0) { gl_error( ctx, GL_INVALID_ENUM, "glTexSubImage3DEXT(type)" ); return; } /* if we get here, probably ran out of memory during unpacking */ gl_error( ctx, GL_OUT_OF_MEMORY, "glTexSubImage3DEXT" ); } } /* * Read an RGBA image from the frame buffer. * Input: ctx - the context * x, y - lower left corner * width, height - size of region to read * format - one of GL_RED, GL_RGB, GL_LUMINANCE, etc. * Return: gl_image pointer or NULL if out of memory */ static struct gl_image *read_color_image( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format ) { struct gl_image *image; GLubyte *imgptr; GLint components; GLint i, j; components = components_in_intformat( format ); /* * Allocate image struct and image data buffer */ image = (struct gl_image *) malloc( sizeof(struct gl_image) ); if (image) { image->Width = width; image->Height = height; image->Depth = 1; image->Components = components; image->Format = format; image->Type = GL_UNSIGNED_BYTE; image->RefCount = 0; image->Data = (GLubyte *) malloc( width * height * components ); if (!image->Data) { free(image); return NULL; } } else { return NULL; } imgptr = (GLubyte *) image->Data; /* Select buffer to read from */ (void) (*ctx->Driver.SetBuffer)( ctx, ctx->Pixel.DriverReadBuffer ); for (j=0;jDriver.SetBuffer)( ctx, ctx->Color.DriverDrawBuffer ); return image; } void gl_CopyTexImage1D( GLcontext *ctx, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border ) { GLint format; struct gl_image *teximage; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexImage1D"); if (target!=GL_TEXTURE_1D) { gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage1D(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage1D(level)" ); return; } if (border!=0 && border!=1) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage1D(border)" ); return; } if (width < 2*border || width > 2 + ctx->Const.MaxTextureSize || width<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage1D(width)" ); return; } format = decode_internal_format( internalformat ); if (format<0 || (internalformat>=1 && internalformat<=4)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage1D(format)" ); return; } teximage = read_color_image( ctx, x, y, width, 1, (GLenum) format ); if (!teximage) { gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexImage1D" ); return; } gl_TexImage1D( ctx, target, level, internalformat, width, border, GL_RGBA, GL_UNSIGNED_BYTE, teximage ); /* teximage was freed in gl_TexImage1D */ } void gl_CopyTexImage2D( GLcontext *ctx, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border ) { GLint format; struct gl_image *teximage; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexImage2D"); if (target!=GL_TEXTURE_2D) { gl_error( ctx, GL_INVALID_ENUM, "glCopyTexImage2D(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage2D(level)" ); return; } if (border!=0 && border!=1) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage2D(border)" ); return; } if (width<2*border || width>2+ctx->Const.MaxTextureSize || width<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage2D(width)" ); return; } if (height<2*border || height>2+ctx->Const.MaxTextureSize || height<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage2D(height)" ); return; } format = decode_internal_format( internalformat ); if (format<0 || (internalformat>=1 && internalformat<=4)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexImage2D(format)" ); return; } teximage = read_color_image( ctx, x, y, width, height, (GLenum) format ); if (!teximage) { gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexImage2D" ); return; } gl_TexImage2D( ctx, target, level, internalformat, width, height, border, GL_RGBA, GL_UNSIGNED_BYTE, teximage ); /* teximage was freed in gl_TexImage2D */ } /* * Do the work of glCopyTexSubImage[123]D. * TODO: apply pixel bias scale and mapping. */ static void copy_tex_sub_image( GLcontext *ctx, struct gl_texture_image *dest, GLint width, GLint height, GLint srcx, GLint srcy, GLint dstx, GLint dsty, GLint zoffset ) { GLint i, j; GLint format, components, rectarea; GLint texwidth, texheight; texwidth = dest->Width; texheight = dest->Height; rectarea = texwidth * texheight; zoffset *= rectarea; format = dest->Format; components = components_in_intformat( format ); /* Select buffer to read from */ (void) (*ctx->Driver.SetBuffer)( ctx, ctx->Pixel.DriverReadBuffer ); for (j=0;jData + ( zoffset + (dsty+j) * texwidth + dstx) * components; switch (format) { case GL_ALPHA: for (i=0;iDriver.SetBuffer)( ctx, ctx->Color.DriverDrawBuffer ); } void gl_CopyTexSubImage1D( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_image *teximage; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexSubImage1D"); if (target!=GL_TEXTURE_1D) { gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage1D(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage1D(level)" ); return; } if (width<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage1D(width)" ); return; } teximage = texUnit->CurrentD[1]->Image[level]; if (teximage) { if (xoffset < -((GLint)teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage1D(xoffset)" ); return; } /* NOTE: we're adding the border here, not subtracting! */ if (xoffset+width > (GLint) (teximage->Width+teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage1D(xoffset+width)" ); return; } if (teximage->Data) { copy_tex_sub_image( ctx, teximage, width, 1, x, y, xoffset, 0, 0 ); /* tell driver about change */ if (ctx->Driver.TexSubImage) { (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], level, xoffset,0,width,1, teximage->IntFormat, teximage ); } else { if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], level, teximage->IntFormat, teximage ); } } } } else { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexSubImage1D" ); } } void gl_CopyTexSubImage2D( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_image *teximage; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexSubImage2D"); if (target!=GL_TEXTURE_2D) { gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage2D(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage2D(level)" ); return; } if (width<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage2D(width)" ); return; } if (height<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage2D(height)" ); return; } teximage = texUnit->CurrentD[2]->Image[level]; if (teximage) { if (xoffset < -((GLint)teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage2D(xoffset)" ); return; } if (yoffset < -((GLint)teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage2D(yoffset)" ); return; } /* NOTE: we're adding the border here, not subtracting! */ if (xoffset+width > (GLint) (teximage->Width+teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage2D(xoffset+width)" ); return; } if (yoffset+height > (GLint) (teximage->Height+teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage2D(yoffset+height)" ); return; } if (teximage->Data) { copy_tex_sub_image( ctx, teximage, width, height, x, y, xoffset, yoffset, 0 ); /* tell driver about change */ if (ctx->Driver.TexSubImage) { (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, xoffset, yoffset, width, height, teximage->IntFormat, teximage ); } else { if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, teximage->IntFormat, teximage ); } } } } else { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexSubImage2D" ); } } void gl_CopyTexSubImage3DEXT( GLcontext *ctx, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_image *teximage; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glCopyTexSubImage3DEXT"); if (target!=GL_TEXTURE_2D) { gl_error( ctx, GL_INVALID_ENUM, "glCopyTexSubImage3DEXT(target)" ); return; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(level)" ); return; } if (width<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(width)" ); return; } if (height<0) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(height)" ); return; } teximage = texUnit->CurrentD[3]->Image[level]; if (teximage) { if (xoffset < -((GLint)teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(xoffset)" ); return; } if (yoffset < -((GLint)teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(yoffset)" ); return; } if (zoffset < -((GLint)teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(zoffset)" ); return; } /* NOTE: we're adding the border here, not subtracting! */ if (xoffset+width > (GLint) (teximage->Width+teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(xoffset+width)" ); return; } if (yoffset+height > (GLint) (teximage->Height+teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(yoffset+height)" ); return; } if (zoffset > (GLint) (teximage->Depth+teximage->Border)) { gl_error( ctx, GL_INVALID_VALUE, "glCopyTexSubImage3DEXT(zoffset+depth)" ); return; } if (teximage->Data) { copy_tex_sub_image( ctx, teximage, width, height, x, y, xoffset, yoffset, zoffset); /* tell driver about change */ if (ctx->Driver.TexImage) { (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texUnit->CurrentD[3], level, teximage->IntFormat, teximage ); } } } else { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexSubImage3DEXT" ); } } @ 3.31 log @initial re-org of pixel pack/unpack code @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.30 1999/07/20 00:32:29 brianp Exp $ */ d1348 2 a1349 1 gl_pack_rgba_span( ctx, width, (void *) src, format, type, dest ); d1412 2 a1413 2 gl_pack_rgba_span( ctx, width, (const GLubyte (*)[4])rgba, format, type, dest ); @ 3.30 log @assign new texel component size fields @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.29 1999/07/12 12:05:25 keithw Exp $ */ d1441 1 a1441 1 return gl_unpack_image3D( ctx, width, height, 1, format, type, pixels ); d1451 3 a1453 2 gl_unpack_texsubimage3D( GLcontext *ctx, GLint width, GLint height, GLint depth, GLenum format, GLenum type, const GLvoid *pixels ) d1467 2 a1468 1 return gl_unpack_image3D( ctx, width, height, depth, format, type, pixels ); @ 3.29 log @merge from experimental branch upto merge-1 tag @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.28 1999/06/25 14:08:20 joukj Exp $ */ d248 78 d367 1 d846 1 d1101 2 a1102 1 ctx->Texture.Proxy1D->Image[level]->Format = (GLenum) internalformat; d1186 2 a1187 1 ctx->Texture.Proxy2D->Image[level]->Format = (GLenum) internalformat; d1272 2 a1273 1 ctx->Texture.Proxy3D->Image[level]->Format = (GLenum) internalformat; @ 3.28 log @ texstate.h inserted @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.27 1999/06/25 01:51:24 brianp Exp $ */ d979 2 a980 2 if (texUnit->Current1D->Image[level]) { gl_free_texture_image( texUnit->Current1D->Image[level] ); d993 3 a995 2 texUnit->Current1D->Image[level] = teximage; gl_put_texobj_on_dirty_list( ctx, texUnit->Current1D ); d1007 1 a1007 1 texUnit->Current1D, d1064 2 a1065 2 if (texUnit->Current2D->Image[level]) { gl_free_texture_image( texUnit->Current2D->Image[level] ); d1078 2 a1079 2 texUnit->Current2D->Image[level] = teximage; gl_put_texobj_on_dirty_list( ctx, texUnit->Current2D ); d1091 1 a1091 1 texUnit->Current2D, d1148 2 a1149 2 if (texUnit->Current3D->Image[level]) { gl_free_texture_image( texUnit->Current3D->Image[level] ); d1162 2 a1163 2 texUnit->Current3D->Image[level] = teximage; gl_put_texobj_on_dirty_list( ctx, texUnit->Current3D ); d1175 1 a1175 1 texUnit->Current3D, d1237 1 a1237 1 texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D; d1240 1 a1240 1 texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D; d1243 1 a1243 1 texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D; d1328 2 a1329 1 gl_pack_rgba_span( ctx, width, rgba, format, type, dest ); d1405 1 a1405 1 destTex = texUnit->Current1D->Image[level]; d1446 1 a1446 1 gl_put_texobj_on_dirty_list( ctx, texUnit->Current1D ); d1451 1 a1451 1 texUnit->Current1D, level, d1453 1 a1453 1 texUnit->Current1D->Image[level]->IntFormat, d1458 2 a1459 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->Current1D, level, texUnit->Current1D->Image[level]->IntFormat, d1513 1 a1513 1 destTex = texUnit->Current2D->Image[level]; d1574 1 a1574 1 gl_put_texobj_on_dirty_list( ctx, texUnit->Current2D ); d1578 1 a1578 1 (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texUnit->Current2D, level, d1580 1 a1580 1 texUnit->Current2D->Image[level]->IntFormat, d1585 2 a1586 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->Current2D, level, texUnit->Current2D->Image[level]->IntFormat, d1644 1 a1644 1 destTex = texUnit->Current3D->Image[level]; d1724 1 a1724 1 gl_put_texobj_on_dirty_list( ctx, texUnit->Current3D ); d1728 2 a1729 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texUnit->Current3D, level, texUnit->Current3D->Image[level]->IntFormat, d2070 1 a2070 1 teximage = texUnit->Current1D->Image[level]; d2089 1 a2089 1 texUnit->Current1D, level, d2096 1 a2096 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->Current1D, level, d2136 1 a2136 1 teximage = texUnit->Current2D->Image[level]; d2164 1 a2164 1 (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texUnit->Current2D, level, d2171 1 a2171 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->Current2D, level, d2211 1 a2211 1 teximage = texUnit->Current3D->Image[level]; d2248 1 a2248 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texUnit->Current3D, @ 3.27 log @implemented linked list for dirty texture objects @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.26 1999/06/16 23:28:14 brianp Exp $ */ d41 1 @ 3.26 log @image_to_texture() mishandled GL_LUMINANCE_ALPHA format @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.25 1999/03/31 20:18:40 keithw Exp $ */ d993 1 a993 2 texUnit->Current1D->Dirty = GL_TRUE; ctx->Texture.AnyDirty = GL_TRUE; d1077 1 a1077 2 texUnit->Current2D->Dirty = GL_TRUE; ctx->Texture.AnyDirty = GL_TRUE; d1161 1 a1161 2 texUnit->Current3D->Dirty = GL_TRUE; ctx->Texture.AnyDirty = GL_TRUE; d1443 1 a1443 2 texUnit->Current1D->Dirty = GL_TRUE; ctx->Texture.AnyDirty = GL_TRUE; d1571 1 a1571 2 texUnit->Current2D->Dirty = GL_TRUE; ctx->Texture.AnyDirty = GL_TRUE; d1721 1 a1721 2 texUnit->Current3D->Dirty = GL_TRUE; ctx->Texture.AnyDirty = GL_TRUE; @ 3.25 log @Compiled vertex arrays @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.24 1999/03/28 20:56:15 brianp Exp $ */ a420 1 case GL_LUMINANCE_ALPHA: d423 4 @ 3.25.2.1 log @Quake3 inspired optimizations @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.25 1999/03/31 20:18:40 keithw Exp $ */ d1326 1 a1326 2 gl_pack_rgba_span( ctx, width, (const GLubyte (*)[4])rgba, format, type, dest ); @ 3.25.2.2 log @some trial assembly, made newer code active by default @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.25.2.1 1999/05/21 21:29:27 keithw Exp $ */ d975 2 a976 2 if (texUnit->CurrentD[1]->Image[level]) { gl_free_texture_image( texUnit->CurrentD[1]->Image[level] ); d989 2 a990 2 texUnit->CurrentD[1]->Image[level] = teximage; texUnit->CurrentD[1]->Dirty = GL_TRUE; d1003 1 a1003 1 texUnit->CurrentD[1], d1060 2 a1061 2 if (texUnit->CurrentD[2]->Image[level]) { gl_free_texture_image( texUnit->CurrentD[2]->Image[level] ); d1074 2 a1075 2 texUnit->CurrentD[2]->Image[level] = teximage; texUnit->CurrentD[2]->Dirty = GL_TRUE; d1088 1 a1088 1 texUnit->CurrentD[2], d1145 2 a1146 2 if (texUnit->CurrentD[3]->Image[level]) { gl_free_texture_image( texUnit->CurrentD[3]->Image[level] ); d1159 2 a1160 2 texUnit->CurrentD[3]->Image[level] = teximage; texUnit->CurrentD[3]->Dirty = GL_TRUE; d1173 1 a1173 1 texUnit->CurrentD[3], d1235 1 a1235 1 texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[1]; d1238 1 a1238 1 texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[2]; d1241 1 a1241 1 texObj = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentD[3]; d1403 1 a1403 1 destTex = texUnit->CurrentD[1]->Image[level]; d1444 1 a1444 1 texUnit->CurrentD[1]->Dirty = GL_TRUE; d1450 1 a1450 1 texUnit->CurrentD[1], level, d1452 1 a1452 1 texUnit->CurrentD[1]->Image[level]->IntFormat, d1457 2 a1458 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], level, texUnit->CurrentD[1]->Image[level]->IntFormat, d1512 1 a1512 1 destTex = texUnit->CurrentD[2]->Image[level]; d1573 1 a1573 1 texUnit->CurrentD[2]->Dirty = GL_TRUE; d1578 1 a1578 1 (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, d1580 1 a1580 1 texUnit->CurrentD[2]->Image[level]->IntFormat, d1585 2 a1586 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, texUnit->CurrentD[2]->Image[level]->IntFormat, d1644 1 a1644 1 destTex = texUnit->CurrentD[3]->Image[level]; d1724 1 a1724 1 texUnit->CurrentD[3]->Dirty = GL_TRUE; d1729 2 a1730 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texUnit->CurrentD[3], level, texUnit->CurrentD[3]->Image[level]->IntFormat, d2071 1 a2071 1 teximage = texUnit->CurrentD[1]->Image[level]; d2090 1 a2090 1 texUnit->CurrentD[1], level, d2097 1 a2097 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texUnit->CurrentD[1], level, d2137 1 a2137 1 teximage = texUnit->CurrentD[2]->Image[level]; d2165 1 a2165 1 (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, d2172 1 a2172 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texUnit->CurrentD[2], level, d2212 1 a2212 1 teximage = texUnit->CurrentD[3]->Image[level]; d2249 1 a2249 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texUnit->CurrentD[3], @ 3.24 log @better handling of multi draw buffers, software alpha buffers @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.23 1999/02/25 14:12:32 keithw Exp $ */ a25 1 @ 3.23 log @Merged in kw3 patch @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.22 1999/02/24 22:48:07 jens Exp $ */ d1816 1 a1816 1 (void) (*ctx->Driver.SetBuffer)( ctx, ctx->Pixel.ReadBuffer ); d1867 1 a1867 1 (void) (*ctx->Driver.SetBuffer)( ctx, ctx->Color.DrawBuffer ); d1992 1 a1992 1 (void) (*ctx->Driver.SetBuffer)( ctx, ctx->Pixel.ReadBuffer ); d2044 1 a2044 1 (void) (*ctx->Driver.SetBuffer)( ctx, ctx->Color.DrawBuffer ); @ 3.22 log @Added header file to get XMesa to compile standalone and inside XFree86 @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.21 1999/02/14 03:46:34 brianp Exp $ */ a27 71 /* * $Log: teximage.c,v $ * Revision 3.21 1999/02/14 03:46:34 brianp * new copyright * * Revision 3.20 1999/01/17 21:37:19 brianp * fixed bugs related to packed pixel formats * * Revision 3.19 1998/11/25 04:18:19 brianp * fixed a few IRIX compiler warnings * * Revision 3.18 1998/11/24 02:34:26 brianp * decode_internal_format() didn't accept GL_COLOR_INDEX * * Revision 3.17 1998/11/17 02:02:20 brianp * added an optimization to image_to_texture() (Josh Vanderhoof) * * Revision 3.16 1998/11/08 22:34:07 brianp * renamed texture sets to texture units * * Revision 3.15 1998/10/31 17:06:15 brianp * variety of multi-texture changes * * Revision 3.14 1998/10/25 18:03:56 brianp * proxy texture Depth field was not initialized * wrong format field used in image_to_texture() (Stephane Rehel) * * Revision 3.13 1998/09/25 03:07:34 brianp * fixed out-of-bounds memory access on X86 (Sven Panne) * * Revision 3.12 1998/09/18 02:32:40 brianp * fixed proxy texture internal format bug reported by Sam Jordon * * Revision 3.11 1998/07/18 03:35:01 brianp * fixed a few error reporting mistakes * * Revision 3.10 1998/07/17 03:25:17 brianp * implemented glGetTexImage() * * Revision 3.9 1998/05/05 00:28:52 brianp * GL_ABGR_EXT pixel format now works with glTexImageXD() * * Revision 3.8 1998/05/05 00:19:47 brianp * added GL_COLOR_INDEX to cases in components_in_intformat * * Revision 3.7 1998/04/20 21:46:08 brianp * added David's second glCopyTexSubImage() patch * * Revision 3.6 1998/04/13 23:16:57 brianp * fixed 3Dfx glCopyTexSubImage() bug (David Bucciarelli) * * Revision 3.5 1998/03/27 04:17:31 brianp * fixed G++ warnings * * Revision 3.4 1998/03/03 02:42:38 brianp * removed a few unneeded assertions * * Revision 3.3 1998/02/20 04:53:37 brianp * implemented GL_SGIS_multitexture * * Revision 3.2 1998/02/07 14:42:29 brianp * NULL proxy image given to glTexImageXD() caused crash (Wes Bethel) * * Revision 3.1 1998/02/01 22:28:41 brianp * removed an unneeded header * * Revision 3.0 1998/01/31 21:04:38 brianp * initial rev * */ d39 1 d513 4 a516 4 GLfloat r = red * (1.0F/255.0F); GLfloat g = green * (1.0F/255.0F); GLfloat b = blue * (1.0F/255.0F); GLfloat a = alpha * (1.0F/255.0F); d965 1 a965 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glTexImage1D" ); return; } d1050 1 a1050 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glTexImage2D" ); return; } d1134 1 a1134 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glTexImage3DEXT" ); return; } d1214 1 a1214 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glGetTexImage" ); return; } d1884 1 a1884 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexImage1D" ); return; } d1929 1 a1929 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexImage2D" ); return; } d2057 1 a2057 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexSubImage1D" ); return; } d2119 1 a2119 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexSubImage2D" ); return; } d2194 1 a2194 4 if (INSIDE_BEGIN_END(ctx)) { gl_error( ctx, GL_INVALID_OPERATION, "glCopyTexSubImage3DEXT" ); return; } @ 3.21 log @new copyright @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.20 1999/01/17 21:37:19 brianp Exp brianp $ */ d30 3 d113 3 @ 3.20 log @fixed bugs related to packed pixel formats @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.19 1998/11/25 04:18:19 brianp Exp brianp $ */ d6 19 a24 15 * Copyright (C) 1995-1999 Brian Paul * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. d30 3 @ 3.19 log @fixed a few IRIX compiler warnings @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.18 1998/11/24 02:34:26 brianp Exp brianp $ */ d6 1 a6 1 * Copyright (C) 1995-1998 Brian Paul d26 3 a880 1 d882 3 a884 1 * Test glTexImagee1D() parameters for errors. d887 6 a892 4 static GLboolean texture_1d_error_check( GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLenum format, GLenum type, GLint width, GLint border ) d894 1 d896 7 a902 12 if (target!=GL_TEXTURE_1D && target!=GL_PROXY_TEXTURE_1D) { gl_error( ctx, GL_INVALID_ENUM, "glTexImage1D" ); return GL_TRUE; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(level)" ); return GL_TRUE; } iformat = decode_internal_format( internalFormat ); if (iformat<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(internalFormat)" ); return GL_TRUE; d904 5 a908 3 if (border!=0 && border!=1) { if (target!=GL_PROXY_TEXTURE_1D) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(border)" ); a909 1 return GL_TRUE; d911 5 a915 3 if (width < 2 * border || width > 2 + ctx->Const.MaxTextureSize) { if (target!=GL_PROXY_TEXTURE_1D) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(width)" ); a916 1 return GL_TRUE; d918 2 a919 3 if (logbase2( width - 2 * border ) < 0) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage1D(width != 2^k + 2*border)"); a921 33 switch (format) { case GL_COLOR_INDEX: case GL_RED: case GL_GREEN: case GL_BLUE: case GL_ALPHA: case GL_RGB: case GL_RGBA: case GL_LUMINANCE: case GL_LUMINANCE_ALPHA: case GL_ABGR_EXT: /* OK */ break; default: gl_error( ctx, GL_INVALID_ENUM, "glTexImage1D(format)" ); return GL_TRUE; } switch (type) { case GL_UNSIGNED_BYTE: case GL_BYTE: case GL_UNSIGNED_SHORT: case GL_SHORT: case GL_UNSIGNED_INT: case GL_INT: case GL_FLOAT: /* OK */ break; default: gl_error( ctx, GL_INVALID_ENUM, "glTexImage1D(type)" ); return GL_TRUE; } return GL_FALSE; } d923 1 a923 25 /* * Test glTexImagee2D() parameters for errors. * Return: GL_TRUE = an error was detected, GL_FALSE = no errors */ static GLboolean texture_2d_error_check( GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLenum format, GLenum type, GLint width, GLint height, GLint border ) { GLint iformat; if (target!=GL_TEXTURE_2D && target!=GL_PROXY_TEXTURE_2D) { gl_error( ctx, GL_INVALID_ENUM, "glTexImage2D(target)" ); return GL_TRUE; } if (level<0 || level>=ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(level)" ); return GL_TRUE; } iformat = decode_internal_format( internalFormat ); if (iformat<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(internalFormat)" ); return GL_TRUE; } d925 7 a931 2 if (target!=GL_PROXY_TEXTURE_2D) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(border)" ); d935 11 a945 3 if (width < 2 * border || width > 2 + ctx->Const.MaxTextureSize) { if (target!=GL_PROXY_TEXTURE_2D) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(width)" ); d949 12 a960 3 if (height < 2 * border || height > 2 + ctx->Const.MaxTextureSize) { if (target!=GL_PROXY_TEXTURE_2D) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage2D(height)" ); a961 1 return GL_TRUE; d963 8 a970 25 if (logbase2( width-2*border )<0) { gl_error( ctx,GL_INVALID_VALUE, "glTexImage2D(width != 2^k + 2*border)"); return GL_TRUE; } if (logbase2( height-2*border )<0) { gl_error( ctx,GL_INVALID_VALUE, "glTexImage2D(height != 2^k + 2*border)"); return GL_TRUE; } switch (format) { case GL_COLOR_INDEX: case GL_RED: case GL_GREEN: case GL_BLUE: case GL_ALPHA: case GL_RGB: case GL_RGBA: case GL_LUMINANCE: case GL_LUMINANCE_ALPHA: case GL_ABGR_EXT: /* OK */ break; default: gl_error( ctx, GL_INVALID_ENUM, "glTexImage2D(format)" ); d972 1 a973 16 switch (type) { case GL_UNSIGNED_BYTE: case GL_BYTE: case GL_UNSIGNED_SHORT: case GL_SHORT: case GL_UNSIGNED_INT: case GL_INT: case GL_FLOAT: /* OK */ break; default: gl_error( ctx, GL_INVALID_ENUM, "glTexImage2D(type)" ); return GL_TRUE; } return GL_FALSE; } d975 1 a975 16 /* * Test glTexImage3DEXT() parameters for errors. * Return: GL_TRUE = an error was detected, GL_FALSE = no errors */ static GLboolean texture_3d_error_check( GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, GLenum format, GLenum type, GLint width, GLint height, GLint depth, GLint border ) { GLint iformat; if (target!=GL_TEXTURE_3D_EXT && target!=GL_PROXY_TEXTURE_3D_EXT) { gl_error( ctx, GL_INVALID_ENUM, "glTexImage3DEXT(target)" ); return GL_TRUE; } d977 6 a982 1 gl_error( ctx, GL_INVALID_VALUE, "glTexImage3DEXT(level)" ); d985 1 d987 7 a993 2 if (iformat<0) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage3DEXT(internalFormat)" ); d996 8 a1003 4 if (border!=0 && border!=1) { if (target!=GL_PROXY_TEXTURE_3D_EXT) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage3DEXT(border)" ); } d1006 2 a1007 64 if (width < 2 * border || width > 2 + ctx->Const.MaxTextureSize) { if (target!=GL_PROXY_TEXTURE_3D_EXT) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage3DEXT(width)" ); } return GL_TRUE; } if (height < 2 * border || height > 2 + ctx->Const.MaxTextureSize) { if (target!=GL_PROXY_TEXTURE_3D_EXT) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage3DEXT(height)" ); } return GL_TRUE; } if (depth < 2 * border || depth > 2 + ctx->Const.MaxTextureSize) { if (target!=GL_PROXY_TEXTURE_3D_EXT) { gl_error( ctx, GL_INVALID_VALUE, "glTexImage3DEXT(depth)" ); } return GL_TRUE; } if (logbase2( width-2*border )<0) { gl_error( ctx,GL_INVALID_VALUE, "glTexImage3DEXT(width != 2^k + 2*border))"); return GL_TRUE; } if (logbase2( height-2*border )<0) { gl_error( ctx,GL_INVALID_VALUE, "glTexImage3DEXT(height != 2^k + 2*border))"); return GL_TRUE; } if (logbase2( depth-2*border )<0) { gl_error( ctx,GL_INVALID_VALUE, "glTexImage3DEXT(depth != 2^k + 2*border))"); return GL_TRUE; } switch (format) { case GL_COLOR_INDEX: case GL_RED: case GL_GREEN: case GL_BLUE: case GL_ALPHA: case GL_RGB: case GL_RGBA: case GL_LUMINANCE: case GL_LUMINANCE_ALPHA: case GL_ABGR_EXT: /* OK */ break; default: gl_error( ctx, GL_INVALID_ENUM, "glTexImage3DEXT(format)" ); return GL_TRUE; } switch (type) { case GL_UNSIGNED_BYTE: case GL_BYTE: case GL_UNSIGNED_SHORT: case GL_SHORT: case GL_UNSIGNED_INT: case GL_INT: case GL_FLOAT: /* OK */ break; default: gl_error( ctx, GL_INVALID_ENUM, "glTexImage3DEXT(type)" ); return GL_TRUE; } d1029 2 a1030 2 if (texture_1d_error_check( ctx, target, level, internalformat, format, type, width, border )) { d1070 2 a1071 2 if (texture_1d_error_check( ctx, target, level, internalformat, format, type, width, border )) { d1117 2 a1118 2 if (texture_2d_error_check( ctx, target, level, internalformat, format, type, width, height, border )) { d1158 2 a1159 2 if (texture_2d_error_check( ctx, target, level, internalformat, format, type, width, height, border )) { d1204 3 a1206 3 if (texture_3d_error_check( ctx, target, level, internalformat, format, type, width, height, depth, border )) { d1246 3 a1248 3 if (texture_3d_error_check( ctx, target, level, internalformat, format, type, width, height, depth, border )) { d1682 1 a1682 1 size = gl_sizeof_type( type ); @ 3.18 log @decode_internal_format() didn't accept GL_COLOR_INDEX @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.17 1998/11/17 02:02:20 brianp Exp brianp $ */ d26 3 d1206 1 a1206 1 ctx->Texture.Proxy1D->Image[level]->IntFormat = internalformat; d1294 1 a1294 1 ctx->Texture.Proxy2D->Image[level]->IntFormat = internalformat; d1383 1 a1383 1 ctx->Texture.Proxy3D->Image[level]->IntFormat = internalformat; @ 3.17 log @added an optimization to image_to_texture() (Josh Vanderhoof) @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.16 1998/11/08 22:34:07 brianp Exp brianp $ */ d26 3 d195 1 @ 3.16 log @renamed texture sets to texture units @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.15 1998/10/31 17:06:15 brianp Exp brianp $ */ d26 3 d454 32 @ 3.15 log @variety of multi-texture changes @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.14 1998/10/25 18:03:56 brianp Exp brianp $ */ d26 3 d1106 1 a1106 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d1121 2 a1122 2 if (texSet->Current1D->Image[level]) { gl_free_texture_image( texSet->Current1D->Image[level] ); d1135 2 a1136 2 texSet->Current1D->Image[level] = teximage; texSet->Current1D->Dirty = GL_TRUE; d1149 1 a1149 1 texSet->Current1D, d1194 1 a1194 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d1209 2 a1210 2 if (texSet->Current2D->Image[level]) { gl_free_texture_image( texSet->Current2D->Image[level] ); d1223 2 a1224 2 texSet->Current2D->Image[level] = teximage; texSet->Current2D->Dirty = GL_TRUE; d1237 1 a1237 1 texSet->Current2D, d1281 1 a1281 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d1297 2 a1298 2 if (texSet->Current3D->Image[level]) { gl_free_texture_image( texSet->Current3D->Image[level] ); d1311 2 a1312 2 texSet->Current3D->Image[level] = teximage; texSet->Current3D->Dirty = GL_TRUE; d1325 1 a1325 1 texSet->Current3D, d1390 1 a1390 1 texObj = ctx->Texture.Set[ctx->Texture.CurrentSet].Current1D; d1393 1 a1393 1 texObj = ctx->Texture.Set[ctx->Texture.CurrentSet].Current2D; d1396 1 a1396 1 texObj = ctx->Texture.Set[ctx->Texture.CurrentSet].Current3D; d1545 1 a1545 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d1557 1 a1557 1 destTex = texSet->Current1D->Image[level]; d1598 1 a1598 1 texSet->Current1D->Dirty = GL_TRUE; d1604 1 a1604 1 texSet->Current1D, level, d1606 1 a1606 1 texSet->Current1D->Image[level]->IntFormat, d1611 2 a1612 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texSet->Current1D, level, texSet->Current1D->Image[level]->IntFormat, d1654 1 a1654 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d1666 1 a1666 1 destTex = texSet->Current2D->Image[level]; d1727 1 a1727 1 texSet->Current2D->Dirty = GL_TRUE; d1732 1 a1732 1 (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texSet->Current2D, level, d1734 1 a1734 1 texSet->Current2D->Image[level]->IntFormat, d1739 2 a1740 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texSet->Current2D, level, texSet->Current2D->Image[level]->IntFormat, d1786 1 a1786 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d1798 1 a1798 1 destTex = texSet->Current3D->Image[level]; d1878 1 a1878 1 texSet->Current3D->Dirty = GL_TRUE; d1883 2 a1884 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texSet->Current3D, level, texSet->Current3D->Image[level]->IntFormat, d2214 1 a2214 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d2234 1 a2234 1 teximage = texSet->Current1D->Image[level]; d2253 1 a2253 1 texSet->Current1D, level, d2260 1 a2260 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, texSet->Current1D, level, d2279 1 a2279 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d2303 1 a2303 1 teximage = texSet->Current2D->Image[level]; d2331 1 a2331 1 (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, texSet->Current2D, level, d2338 1 a2338 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, texSet->Current2D, level, d2357 1 a2357 1 struct gl_texture_set *texSet = &ctx->Texture.Set[ctx->Texture.CurrentSet]; d2381 1 a2381 1 teximage = texSet->Current3D->Image[level]; d2418 1 a2418 1 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, texSet->Current3D, @ 3.14 log @proxy texture Depth field was not initialized wrong format field used in image_to_texture() (Stephane Rehel) @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.13 1998/09/25 03:07:34 brianp Exp brianp $ */ d5 1 a5 1 * Version: 3.0 d26 4 d848 1 a848 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d863 1 a863 1 if (width<2*border || width>2+MAX_TEXTURE_SIZE) { d869 1 a869 1 if (logbase2( width-2*border )<0) { d924 1 a924 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d939 1 a939 1 if (width<2*border || width>2+MAX_TEXTURE_SIZE) { d945 1 a945 1 if (height<2*border || height>2+MAX_TEXTURE_SIZE) { d1011 1 a1011 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d1026 1 a1026 1 if (width<2*border || width>2+MAX_TEXTURE_SIZE) { d1032 1 a1032 1 if (height<2*border || height>2+MAX_TEXTURE_SIZE) { d1038 1 a1038 1 if (depth<2*border || depth>2+MAX_TEXTURE_SIZE) { d1154 1 a1154 1 if (level>=0 && level=0 && level=0 && level= MAX_TEXTURE_LEVELS) { d1549 1 a1549 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d1658 1 a1658 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d1790 1 a1790 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d2043 1 a2043 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d2051 1 a2051 1 if (width<2*border || width>2+MAX_TEXTURE_SIZE || width<0) { d2091 1 a2091 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d2099 1 a2099 1 if (width<2*border || width>2+MAX_TEXTURE_SIZE || width<0) { d2103 1 a2103 1 if (height<2*border || height>2+MAX_TEXTURE_SIZE || height<0) { d2222 1 a2222 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d2287 1 a2287 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { d2365 1 a2365 1 if (level<0 || level>=MAX_TEXTURE_LEVELS) { @ 3.13 log @fixed out-of-bounds memory access on X86 (Sven Panne) @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.12 1998/09/18 02:32:40 brianp Exp brianp $ */ d26 3 d589 1 a589 1 switch (texImage->Format) { d1161 1 d1249 1 @ 3.12 log @fixed proxy texture internal format bug reported by Sam Jordon @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.11 1998/07/18 03:35:01 brianp Exp brianp $ */ d26 3 d282 10 d341 1 a341 1 texImage->Data = (GLubyte *) malloc( numPixels * components ); d788 1 a788 1 texImage->Data = (GLubyte *) malloc( numPixels * components ); @ 3.11 log @fixed a few error reporting mistakes @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.10 1998/07/17 03:25:17 brianp Exp brianp $ */ d26 3 d1141 1 d1228 1 d1316 1 @ 3.10 log @implemented glGetTexImage() @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.9 1998/05/05 00:28:52 brianp Exp brianp $ */ d26 3 d873 2 d1334 5 d1377 1 d1383 1 a1452 4 } else { gl_error( ctx, GL_INVALID_VALUE, "glGetTexImage(level)" ); return; @ 3.9 log @GL_ABGR_EXT pixel format now works with glTexImageXD() @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.8 1998/05/05 00:19:47 brianp Exp brianp $ */ d26 3 d1327 119 a1445 7 /* TODO */ gl_problem(ctx, "glGetTexImage not implemented"); (void) target; (void) level; (void) format; (void) type; (void) pixels; @ 3.8 log @added GL_COLOR_INDEX to cases in components_in_intformat @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.7 1998/04/20 21:46:08 brianp Exp brianp $ */ d26 3 d855 1 d940 1 d1038 1 @ 3.7 log @added David's second glCopyTexSubImage() patch @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.6 1998/04/13 23:16:57 brianp Exp $ */ d26 3 d235 1 @ 3.6 log @fixed 3Dfx glCopyTexSubImage() bug (David Bucciarelli) @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.5 1998/03/27 04:17:31 brianp Exp $ */ d26 3 d1968 1 a1968 1 * Do the work of glCopyTexSubImage[12]D. d1978 1 d1980 3 a1982 1 rectarea = width*height; d1987 3 d1996 1 a1996 1 texptr = dest->Data + ( zoffset + (dsty+j) * width + dstx) * components; d2037 4 d2091 1 a2091 1 texSet->Current1D->Image[level]->IntFormat, d2097 1 a2097 1 texSet->Current1D->Image[level]->IntFormat, a2164 1 d2169 1 a2169 1 texSet->Current2D->Image[level]->IntFormat, d2175 1 a2175 1 texSet->Current2D->Image[level]->IntFormat, d2255 1 a2255 1 level, texSet->Current3D->Image[level]->IntFormat, @ 3.5 log @fixed G++ warnings @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.4 1998/03/03 02:42:38 brianp Exp brianp $ */ d26 3 d2072 16 d2152 15 d2239 7 @ 3.4 log @removed a few unneeded assertions @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.3 1998/02/20 04:53:37 brianp Exp brianp $ */ d26 3 d267 1 a267 1 GLenum internalFormat, GLint border ) d287 2 a288 2 texImage->Format = decode_internal_format(internalFormat); texImage->IntFormat = internalFormat; d418 4 a421 4 red = 255.0F * ctx->Pixel.MapItoR[index]; green = 255.0F * ctx->Pixel.MapItoG[index]; blue = 255.0F * ctx->Pixel.MapItoB[index]; alpha = 255.0F * ctx->Pixel.MapItoA[index]; d720 1 d730 1 a730 1 texImage->Format = decode_internal_format(internalFormat); d797 1 a797 1 GLint level, GLenum internalFormat, d869 1 a869 1 GLint level, GLenum internalFormat, d955 1 a955 1 GLint level, GLenum internalFormat, d1080 1 a1080 1 teximage = make_null_texture(ctx, internalformat, d1113 1 a1113 1 ctx->Texture.Proxy1D->Image[level]->Format = internalformat; d1166 1 a1166 1 teximage = make_null_texture(ctx, internalformat, d1199 1 a1199 1 ctx->Texture.Proxy2D->Image[level]->Format = internalformat; d1252 1 a1252 1 teximage = make_null_texture(ctx, internalformat, d1286 1 a1286 1 ctx->Texture.Proxy3D->Image[level]->Format = internalformat; d1308 1 d1310 5 a1314 1 /* TODO */ d1397 1 a1397 1 if (xoffset + width > destTex->Width + destTex->Border) { d1510 1 a1510 1 if (xoffset + width > destTex->Width + destTex->Border) { d1514 1 a1514 1 if (yoffset + height > destTex->Height + destTex->Border) { d1646 1 a1646 1 if (xoffset + width > destTex->Width+destTex->Border) { d1650 1 a1650 1 if (yoffset + height > destTex->Height+destTex->Border) { d1654 1 a1654 1 if (zoffset + depth > destTex->Depth+destTex->Border) { d1766 1 a1766 1 GLint format ) d1843 3 d1894 1 a1894 1 teximage = read_color_image( ctx, x, y, width, 1, format ); d1946 1 a1946 1 teximage = read_color_image( ctx, x, y, width, height, format ); d2062 1 a2062 1 if (xoffset+width > teximage->Width+teximage->Border) { d2119 1 a2119 1 if (xoffset+width > teximage->Width+teximage->Border) { d2124 1 a2124 1 if (yoffset+height > teximage->Height+teximage->Border) { d2186 1 a2186 1 if (xoffset+width > teximage->Width+teximage->Border) { d2191 1 a2191 1 if (yoffset+height > teximage->Height+teximage->Border) { d2196 1 a2196 1 if (zoffset > teximage->Depth+teximage->Border) { @ 3.3 log @implemented GL_SGIS_multitexture @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.2 1998/02/07 14:42:29 brianp Exp brianp $ */ d26 3 a303 4 assert(texImage->WidthLog2>=0); assert(texImage->HeightLog2>=0); assert(texImage->DepthLog2>=0); @ 3.2 log @NULL proxy image given to glTexImageXD() caused crash (Wes Bethel) @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.1 1998/02/01 22:28:41 brianp Exp brianp $ */ d26 3 d1053 1 d1068 2 a1069 2 if (ctx->Texture.Current1D->Image[level]) { gl_free_texture_image( ctx->Texture.Current1D->Image[level] ); d1082 2 a1083 2 ctx->Texture.Current1D->Image[level] = teximage; ctx->Texture.Current1D->Dirty = GL_TRUE; d1096 1 a1096 1 ctx->Texture.Current1D, d1139 1 d1154 2 a1155 2 if (ctx->Texture.Current2D->Image[level]) { gl_free_texture_image( ctx->Texture.Current2D->Image[level] ); d1168 2 a1169 2 ctx->Texture.Current2D->Image[level] = teximage; ctx->Texture.Current2D->Dirty = GL_TRUE; d1182 1 a1182 1 ctx->Texture.Current2D, d1224 1 d1240 2 a1241 2 if (ctx->Texture.Current3D->Image[level]) { gl_free_texture_image( ctx->Texture.Current3D->Image[level] ); d1254 2 a1255 2 ctx->Texture.Current3D->Image[level] = teximage; ctx->Texture.Current3D->Dirty = GL_TRUE; d1268 1 a1268 1 ctx->Texture.Current3D, d1367 1 d1379 1 a1379 1 destTex = ctx->Texture.Current1D->Image[level]; d1420 1 a1420 1 ctx->Texture.Current1D->Dirty = GL_TRUE; d1426 1 a1426 1 ctx->Texture.Current1D, level, d1428 1 a1428 1 ctx->Texture.Current1D->Image[level]->IntFormat, d1433 2 a1434 3 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_1D, ctx->Texture.Current1D, level, ctx->Texture.Current1D->Image[level]->IntFormat, d1476 1 d1488 1 a1488 1 destTex = ctx->Texture.Current2D->Image[level]; d1549 1 a1549 1 ctx->Texture.Current2D->Dirty = GL_TRUE; d1554 1 a1554 1 (*ctx->Driver.TexSubImage)( ctx, GL_TEXTURE_2D, ctx->Texture.Current2D, level, d1556 1 a1556 1 ctx->Texture.Current2D->Image[level]->IntFormat, d1561 2 a1562 2 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_2D, ctx->Texture.Current2D, level, ctx->Texture.Current2D->Image[level]->IntFormat, d1608 1 d1620 1 a1620 1 destTex = ctx->Texture.Current3D->Image[level]; d1700 1 a1700 1 ctx->Texture.Current3D->Dirty = GL_TRUE; d1705 2 a1706 3 (*ctx->Driver.TexImage)( ctx, GL_TEXTURE_3D_EXT, ctx->Texture.Current3D, level, ctx->Texture.Current3D->Image[level]->IntFormat, d2023 1 d2043 1 a2043 1 teximage = ctx->Texture.Current1D->Image[level]; d2072 1 d2096 1 a2096 1 teximage = ctx->Texture.Current2D->Image[level]; d2136 1 d2160 1 a2160 1 teximage = ctx->Texture.Current3D->Image[level]; @ 3.1 log @removed an unneeded header @ text @d1 1 a1 1 /* $Id: teximage.c,v 3.0 1998/01/31 21:04:38 brianp Exp brianp $ */ d26 3 d1111 1 a1111 1 if (image->RefCount==0) { d1196 1 a1196 1 if (image->RefCount==0) { d1283 1 a1283 1 if (image->RefCount==0) { @ 3.0 log @initial rev @ text @d1 1 a1 1 /* $Id$ */ d25 4 a28 1 * $Log$ a41 1 #include "pixel.h" @