Continue with subset_texture.c, get some demos working

src/glut/mini/bitmap.c

@@ -12,8 +12,8 @@ glutBitmapCharacter(GLUTbitmapFont font, int c)
 {
   const BitmapCharRec *ch;
   BitmapFontPtr fontinfo;
-  GLint swapbytes, lsbfirst, rowlength;
-  GLint skiprows, skippixels, alignment;
+  GLfloat swapbytes, lsbfirst, rowlength;
+  GLfloat skiprows, skippixels, alignment;
 
 #if defined(_WIN32)
   fontinfo = (BitmapFontPtr) __glutFont(font);
@@ -27,30 +27,30 @@ glutBitmapCharacter(GLUTbitmapFont font, int c)
   ch = fontinfo->ch[c - fontinfo->first];
   if (ch) {
     /* Save current modes. */
-    glGetIntegerv(GL_UNPACK_SWAP_BYTES, &swapbytes);
-    glGetIntegerv(GL_UNPACK_LSB_FIRST, &lsbfirst);
-    glGetIntegerv(GL_UNPACK_ROW_LENGTH, &rowlength);
-    glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skiprows);
-    glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skippixels);
-    glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
+/*     glGetFloatv(GL_UNPACK_SWAP_BYTES, &swapbytes); */
+    glGetFloatv(GL_UNPACK_LSB_FIRST, &lsbfirst);
+    glGetFloatv(GL_UNPACK_ROW_LENGTH, &rowlength);
+/*     glGetFloatv(GL_UNPACK_SKIP_ROWS, &skiprows); */
+/*     glGetFloatv(GL_UNPACK_SKIP_PIXELS, &skippixels); */
+/*     glGetFloatv(GL_UNPACK_ALIGNMENT, &alignment); */
     /* Little endian machines (DEC Alpha for example) could
        benefit from setting GL_UNPACK_LSB_FIRST to GL_TRUE
        instead of GL_FALSE, but this would require changing the
        generated bitmaps too. */
-    glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE);
+/*     glPixelStorei(GL_UNPACK_SWAP_BYTES, GL_FALSE); */
     glPixelStorei(GL_UNPACK_LSB_FIRST, GL_FALSE);
     glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-    glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-    glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+/*     glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); */
+/*     glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); */
+/*     glPixelStorei(GL_UNPACK_ALIGNMENT, 1); */
     glBitmap(ch->width, ch->height, ch->xorig, ch->yorig,
       ch->advance, 0, ch->bitmap);
     /* Restore saved modes. */
-    glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes);
-    glPixelStorei(GL_UNPACK_LSB_FIRST, lsbfirst);
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, rowlength);
-    glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows);
-    glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels);
-    glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
+/*     glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes); */
+    glPixelStorei(GL_UNPACK_LSB_FIRST, (int)lsbfirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, (int)rowlength);
+/*     glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows); */
+/*     glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels); */
+/*     glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); */
   }
 }

src/mesa/drivers/dri/radeon/radeon_subset_tex.c

@@ -999,8 +999,6 @@ void radeonInitTextureFuncs( GLcontext *ctx )
    ctx->Driver.ChooseTextureFormat	= radeonChooseTextureFormat;
    ctx->Driver.TexImage2D		= radeonTexImage2D;
 
-   ctx->Driver.TestProxyTexImage	= _mesa_test_proxy_teximage;
-
    ctx->Driver.BindTexture		= radeonBindTexture;
    ctx->Driver.CreateTexture		= NULL; /* FIXME: Is this used??? */
    ctx->Driver.DeleteTexture		= radeonDeleteTexture;

src/mesa/main/context.c

@@ -28,7 +28,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: context.c,v 1.188.2.1.2.8 2003/03/16 00:27:12 jrfonseca Exp $ */
+/* $Id: context.c,v 1.188.2.1.2.9 2003/03/17 15:18:16 keithw Exp $ */
 
 /**
  * \mainpage Mesa Core Module
@@ -215,6 +215,8 @@ _mesa_shareContext(__GLcontext *gc, __GLcontext *gcShare)
    }
 }
 
+
+#if _HAVE_FULL_GL
 /**
  * \brief Copy context callback.
  */
@@ -229,6 +231,7 @@ _mesa_copyContext(__GLcontext *dst, const __GLcontext *src, GLuint mask)
       return GL_FALSE;
    }
 }
+#endif
 
 /** No-op. */
 GLboolean
@@ -319,6 +322,7 @@ _mesa_endDispatchOverride(__GLcontext *gc)
 static void
 _mesa_init_default_exports(__GLexports *exports)
 {
+#if _HAVE_FULL_GL
     exports->destroyContext = _mesa_destroyContext;
     exports->loseCurrent = _mesa_loseCurrent;
     exports->makeCurrent = _mesa_makeCurrent;
@@ -331,6 +335,7 @@ _mesa_init_default_exports(__GLexports *exports)
     exports->dispatchExec = _mesa_dispatchExec;
     exports->beginDispatchOverride = _mesa_beginDispatchOverride;
     exports->endDispatchOverride = _mesa_endDispatchOverride;
+#endif
 }
 
 /**
@@ -2268,6 +2273,7 @@ _mesa_destroy_context( GLcontext *ctx )
    }
 }
 
+#if _HAVE_FULL_GL
 /**
  * \brief Copy attribute groups from one context to another.
  * 
@@ -2386,6 +2392,7 @@ _mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
     */
    dst->NewState = _NEW_ALL;
 }
+#endif
 
 /**
  * \brief Print information about this Mesa version and build options.

src/mesa/main/image.c

@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.69.4.2 2003/03/09 10:52:20 jrfonseca Exp $ */
+/* $Id: image.c,v 1.69.4.3 2003/03/17 15:18:16 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -572,6 +572,7 @@ _mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
    }
 }
 
+#if _HAVE_FULL_GL
 
 
 /*
@@ -3941,3 +3942,5 @@ _mesa_unpack_image( GLsizei width, GLsizei height, GLsizei depth,
       return destBuffer;
    }
 }
+
+#endif

src/mesa/main/pixel.c

@@ -1,4 +1,4 @@
-/* $Id: pixel.c,v 1.37 2002/10/24 23:57:21 brianp Exp $ */
+/* $Id: pixel.c,v 1.37.4.1 2003/03/17 15:18:16 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -777,7 +777,7 @@ _mesa_PixelTransferi( GLenum pname, GLint param )
    _mesa_PixelTransferf( pname, (GLfloat) param );
 }
 
-
+#if _HAVE_FULL_GL
 
 /**********************************************************************/
 /*****                  Pixel processing functions               ******/
@@ -1329,3 +1329,5 @@ _mesa_chan_to_float_span(const GLcontext *ctx, GLuint n,
    }
 #endif
 }
+
+#endif

src/mesa/main/polygon.c

@@ -1,4 +1,4 @@
-/* $Id: polygon.c,v 1.25.4.1 2003/01/10 21:57:41 brianp Exp $ */
+/* $Id: polygon.c,v 1.25.4.2 2003/03/17 15:18:16 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -143,7 +143,7 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
    }
 }
 
-
+#if _HAVE_FULL_GL
 
 void
 _mesa_PolygonStipple( const GLubyte *pattern )
@@ -176,7 +176,6 @@ _mesa_GetPolygonStipple( GLubyte *dest )
 }
 
 
-
 void
 _mesa_PolygonOffset( GLfloat factor, GLfloat units )
 {
@@ -206,3 +205,5 @@ _mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
    GET_CURRENT_CONTEXT(ctx);
    _mesa_PolygonOffset(factor, bias * ctx->DepthMaxF );
 }
+
+#endif

src/mesa/main/state.c

@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.97.4.4 2003/03/05 14:22:25 keithw Exp $ */
+/* $Id: state.c,v 1.97.4.5 2003/03/17 15:18:17 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -132,17 +132,9 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    exec->Flush = _mesa_Flush;
    exec->FrontFace = _mesa_FrontFace;
    exec->Frustum = _mesa_Frustum;
-   exec->GetBooleanv = _mesa_GetBooleanv;
    exec->GetError = _mesa_GetError;
    exec->GetFloatv = _mesa_GetFloatv;
-   exec->GetIntegerv = _mesa_GetIntegerv;
    exec->GetString = _mesa_GetString;
-   exec->GetTexEnvfv = _mesa_GetTexEnvfv;
-   exec->GetTexEnviv = _mesa_GetTexEnviv;
-   exec->GetTexLevelParameterfv = _mesa_GetTexLevelParameterfv;
-   exec->GetTexLevelParameteriv = _mesa_GetTexLevelParameteriv;
-   exec->GetTexParameterfv = _mesa_GetTexParameterfv;
-   exec->GetTexParameteriv = _mesa_GetTexParameteriv;
    exec->InitNames = _mesa_InitNames;
    exec->LineStipple = _mesa_LineStipple;
    exec->LineWidth = _mesa_LineWidth;
@@ -203,7 +195,9 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    exec->Fogiv = _mesa_Fogiv;
    exec->GenLists = _mesa_GenLists;
    exec->GetClipPlane = _mesa_GetClipPlane;
+   exec->GetBooleanv = _mesa_GetBooleanv;
    exec->GetDoublev = _mesa_GetDoublev;
+   exec->GetIntegerv = _mesa_GetIntegerv;
    exec->GetLightfv = _mesa_GetLightfv;
    exec->GetLightiv = _mesa_GetLightiv;
    exec->GetMapdv = _mesa_GetMapdv;
@@ -215,6 +209,12 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    exec->GetPixelMapuiv = _mesa_GetPixelMapuiv;
    exec->GetPixelMapusv = _mesa_GetPixelMapusv;
    exec->GetPolygonStipple = _mesa_GetPolygonStipple;
+   exec->GetTexEnvfv = _mesa_GetTexEnvfv;
+   exec->GetTexEnviv = _mesa_GetTexEnviv;
+   exec->GetTexLevelParameterfv = _mesa_GetTexLevelParameterfv;
+   exec->GetTexLevelParameteriv = _mesa_GetTexLevelParameteriv;
+   exec->GetTexParameterfv = _mesa_GetTexParameterfv;
+   exec->GetTexParameteriv = _mesa_GetTexParameteriv;
    exec->GetTexGendv = _mesa_GetTexGendv;
    exec->GetTexGenfv = _mesa_GetTexGenfv;
    exec->GetTexGeniv = _mesa_GetTexGeniv;