[paragui-cvs] CVS: paragui/src/draw/opengl pggloper.cpp,1.1.2.3,1.1.2.4 pgglroot.cpp,1.1.2.4,1.1.2.5

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/draw/opengl
In directory subversions:/tmp/cvs-serv14984/src/draw/opengl

Modified Files:
      Tag: devel-opengl
        pggloper.cpp pgglroot.cpp 
Log Message:
minor updates to OpenGL.
Probably breaks things.  *sigh*


Index: pggloper.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/pggloper.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** pggloper.cpp        31 Oct 2002 17:54:19 -0000      1.1.2.3
--- pggloper.cpp        1 Nov 2002 00:43:11 -0000       1.1.2.4
***************
*** 465,476 ****
      return 0; /* only the root surface has this BUT... */
    };
!   DBG5(DBGFUNC());
!   DBG5(PG_LogMSG("%s:%i %p: %i x %i x %i : tile (%i,%i)", __FUNCTION__, 
__LINE__, datasurf->pixels, datasurf->w, datasurf->h, bpp, txi->tilew, 
txi->tileh));
    // return 0; // DEBUG
  
!   DBG5(PG_LogMSG("%s:%i %p:%p[%i]", __FUNCTION__, __LINE__, txi, 
txi->texture, tex));
  
    glGenTextures(1, &txi->texture[tex]);
!   DBG5(DBGLINE());
    glBindTexture(GL_TEXTURE_2D, txi->texture[tex]);
    // PG_LogDBG("ParaGUI[%s]: %s:%i pitch %i bpp %i", __FILE__, __FUNCTION__, 
__LINE__, datasurf->pitch, bpp);
--- 465,476 ----
      return 0; /* only the root surface has this BUT... */
    };
!   // DBG5(DBGFUNC());
!   // DBG5(PG_LogMSG("%s:%i %p: %i x %i x %i : tile (%i,%i)", __FUNCTION__, 
__LINE__, datasurf->pixels, datasurf->w, datasurf->h, bpp, txi->tilew, 
txi->tileh));
    // return 0; // DEBUG
  
!   // DBG5(PG_LogMSG("%s:%i %p:%p[%i]", __FUNCTION__, __LINE__, txi, 
txi->texture, tex));
  
    glGenTextures(1, &txi->texture[tex]);
!   // DBG5(DBGLINE());
    glBindTexture(GL_TEXTURE_2D, txi->texture[tex]);
    // PG_LogDBG("ParaGUI[%s]: %s:%i pitch %i bpp %i", __FILE__, __FUNCTION__, 
__LINE__, datasurf->pitch, bpp);
***************
*** 478,485 ****
--- 478,487 ----
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ #if 0
    DBG5(PG_LogMSG("amask %s size %ix%i form %s",
                 datasurf->format->Amask ? "GL_RGBA8" : "GL_RGB8",
                 txi->texsize, txi->texsize,
                 datasurf->format->Amask ? "GL_RGBA" : "GL_RGB"));
+ #endif
    glTexImage2D(GL_TEXTURE_2D, 0,
               datasurf->format->Amask ? GL_RGBA8 : GL_RGB8,
***************
*** 497,501 ****
        int fromx = txi->tilew * tex * txi->tilespertex;
        int toy = 0;
!       DBG5(PG_LogMSG("fromx %i yoff %i bpp %i on %p", fromx, toy, bpp, 
datasurf->pixels));
        while(toy + txi->tileh <= txi->texsize) {
          int thistw;
--- 499,503 ----
        int fromx = txi->tilew * tex * txi->tilespertex;
        int toy = 0;
!       // DBG5(PG_LogMSG("fromx %i yoff %i bpp %i on %p", fromx, toy, bpp, 
datasurf->pixels));
        while(toy + txi->tileh <= txi->texsize) {
          int thistw;
***************
*** 504,508 ****
          else if (thistw <= 0)    break;
  
! #if 1
          DBG5(DBGLINE());
          DBG5(PG_LogMSG("yoff %i w %i h %i mask %s %p",
--- 506,510 ----
          else if (thistw <= 0)    break;
  
! #if 0
          DBG5(DBGLINE());
          DBG5(PG_LogMSG("yoff %i w %i h %i mask %s %p",
***************
*** 512,528 ****
  #endif
  #if 0
-         {
-           DBG5(DBGLINE());
-           char* s = (char*)alloca(sizeof(char) * thistw);
-           DBG5(DBGLINE());
-           memcpy(s, ((Uint8 *)datasurf->pixels) + (bpp * fromx), thistw);
-           DBG5(DBGLINE());
-         };
- #endif
- #if 1
          DBG5(DBGLINE());
          DBG5(dumpimg(datasurf));
          {
! #if 1
            Uint8* ptr;
            ptr = (Uint8*)datasurf->pixels;
--- 514,521 ----
  #endif
  #if 0
          DBG5(DBGLINE());
          DBG5(dumpimg(datasurf));
          {
! #if 0
            Uint8* ptr;
            ptr = (Uint8*)datasurf->pixels;

Index: pgglroot.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/draw/opengl/Attic/pgglroot.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** pgglroot.cpp        31 Oct 2002 22:43:32 -0000      1.1.2.4
--- pgglroot.cpp        1 Nov 2002 00:43:11 -0000       1.1.2.5
***************
*** 442,446 ****
    if (src->GetCreator() != creator) {
      DBG5(DBGLINE());
!     PG_LogERR("ERROR - source tile in DrawTile is from alien driver!");
      return;
    };
--- 442,446 ----
    if (src->GetCreator() != creator) {
      DBG5(DBGLINE());
!     PG_LogERR("ERROR - source tile in BlitScale is from alien driver!");
      return;
    };
***************
*** 639,643 ****
      if (background->GetCreator() != creator) {
        DBG5(DBGLINE());
!       PG_LogERR("ERROR - source tile in DrawTile is from alien driver!");
        return;
      };
--- 639,643 ----
      if (background->GetCreator() != creator) {
        DBG5(DBGLINE());
!       PG_LogERR("ERROR - source tile in DrawThemedSurface is from alien 
driver!");
        return;
      };