Difference for arch/ogl/ogl.c from version 1.39 to 1.40

version 1.39 version 1.40
Line 56
 
Line 56
 extern int gr_badtexture;  extern int gr_badtexture;
 int r_texcount=0, r_cachedtexcount=0;  int r_texcount=0, r_cachedtexcount=0;
 int ogl_alttexmerge=1;//merge textures by just printing the seperate textures?  int ogl_alttexmerge=1;//merge textures by just printing the seperate textures?
 int ogl_rgba_format=4;  int ogl_rgba_internalformat=GL_RGBA8;
   int ogl_rgb_internalformat=GL_RGB8;
 int ogl_intensity4_ok=1;  int ogl_intensity4_ok=1;
 int ogl_luminance4_alpha4_ok=1;  int ogl_luminance4_alpha4_ok=1;
 int ogl_rgba2_ok=1;  int ogl_rgba2_ok=1;
Line 95
 
Line 96
  t->lastrend=0;   t->lastrend=0;
  t->numrend=0;   t->numrend=0;
 }  }
 void ogl_init_texture(ogl_texture* t){  void ogl_init_texture(ogl_texture* t, int w, int h, int flags){
  t->handle=0;   t->handle=0;
  t->internalformat=ogl_rgba_format;   if (flags & OGL_FLAG_NOCOLOR) {
    //use GL_INTENSITY instead of GL_RGB
    if (flags & OGL_FLAG_ALPHA) {
    if (ogl_intensity4_ok){
    t->internalformat=GL_INTENSITY4;
    t->format=GL_LUMINANCE;
    }else if (ogl_luminance4_alpha4_ok){
    t->internalformat=GL_LUMINANCE4_ALPHA4;
    t->format=GL_LUMINANCE_ALPHA;
    }else if (ogl_rgba2_ok){
    t->internalformat=GL_RGBA2;
  t->format=GL_RGBA;   t->format=GL_RGBA;
    }else{
    t->internalformat=ogl_rgba_internalformat;
    t->format=GL_RGBA;
    }
    } else {
    //there are certainly smaller formats we could use here, but nothing needs it ATM.
    t->internalformat=ogl_rgb_internalformat;
    t->format=GL_RGB;
    }
    } else {
    if (flags & OGL_FLAG_ALPHA) {
    t->internalformat=ogl_rgba_internalformat;
    t->format=GL_RGBA;
    } else {
    t->internalformat=ogl_rgb_internalformat;
    t->format=GL_RGB;
    }
    }
  t->wrapstate[0]=-1;   t->wrapstate[0]=-1;
  t->wrapstate[1]=-1;   t->wrapstate[1]=-1;
  t->w=t->h=0;   t->lw=t->w=w; t->h=h;
    t->wantmip=flags&OGL_FLAG_MIPMAP;
  ogl_init_texture_stats(t);   ogl_init_texture_stats(t);
 }  }
   void ogl_reset_texture(ogl_texture* t){
    ogl_init_texture(t,0,0,0);
   }
 void ogl_reset_texture_stats_internal(void){  void ogl_reset_texture_stats_internal(void){
  int i;   int i;
  for (i=0;i<OGL_TEXTURE_LIST_SIZE;i++)   for (i=0;i<OGL_TEXTURE_LIST_SIZE;i++)
Line 115
 
Line 148
  int i;   int i;
  ogl_texture_list_cur=0;   ogl_texture_list_cur=0;
  for (i=0;i<OGL_TEXTURE_LIST_SIZE;i++)   for (i=0;i<OGL_TEXTURE_LIST_SIZE;i++)
  ogl_init_texture(&ogl_texture_list[i]);   ogl_reset_texture(&ogl_texture_list[i]);
 }  }
 void ogl_smash_texture_list_internal(void){  void ogl_smash_texture_list_internal(void){
  int i;   int i;
Line 156
 
Line 189
 // return NULL;  // return NULL;
 }  }
 int ogl_texture_stats(void){  int ogl_texture_stats(void){
  int used=0,usedl4a4=0,usedrgba=0,databytes=0,truebytes=0,datatexel=0,truetexel=0,i;   int used=0,usedother=0,usedidx=0,usedrgb=0,usedrgba=0,databytes=0;
    int truebytes=0,datatexel=0,truetexel=0,i;
  int prio0=0,prio1=0,prio2=0,prio3=0,prioh=0;   int prio0=0,prio1=0,prio2=0,prio3=0,prioh=0;
 // int grabbed=0;  // int grabbed=0;
  ogl_texture* t;   ogl_texture* t;
Line 173
 
Line 207
  else if (t->prio<0.499)prio2++;   else if (t->prio<0.499)prio2++;
  else if (t->prio<0.599)prio3++;   else if (t->prio<0.599)prio3++;
  else prioh++;   else prioh++;
    if (t->format==GL_RGBA)
    usedrgba++;
    else if (t->format==GL_RGB)
    usedrgb++;
    else if (t->format==GL_COLOR_INDEX)
    usedidx++;
    else
    usedother++;
  }   }
 // else if(t->w!=0)  // else if(t->w!=0)
 // grabbed++;  // grabbed++;
Line 190
 
Line 232
  glGetIntegerv(GL_DEPTH_BITS, &depth);   glGetIntegerv(GL_DEPTH_BITS, &depth);
  colorsize=(idx*res*dbl)/8;   colorsize=(idx*res*dbl)/8;
  depthsize=res*depth/8;   depthsize=res*depth/8;
  gr_printf(5,GAME_FONT->ft_h*14+3*14,"%i(%i,%i) %iK(%iK wasted) (%i postcachedtex)",used,usedrgba,usedl4a4,truebytes/1024,(truebytes-databytes)/1024, r_texcount-r_cachedtexcount);   gr_printf(5,GAME_FONT->ft_h*14+3*14,"%i(%i,%i,%i,%i) %iK(%iK wasted) (%i postcachedtex)",used,usedrgba,usedrgb,usedidx,usedother,truebytes/1024,(truebytes-databytes)/1024, r_texcount-r_cachedtexcount);
  gr_printf(5,GAME_FONT->ft_h*15+3*15,"%ibpp(r%i,g%i,b%i,a%i)x%i=%iK depth%i=%iK",idx,r,g,b,a,dbl,colorsize/1024, depth, depthsize/1024);   gr_printf(5,GAME_FONT->ft_h*15+3*15,"%ibpp(r%i,g%i,b%i,a%i)x%i=%iK depth%i=%iK",idx,r,g,b,a,dbl,colorsize/1024, depth, depthsize/1024);
  gr_printf(5,GAME_FONT->ft_h*16+3*16,"total=%iK",(colorsize+depthsize+truebytes)/1024);   gr_printf(5,GAME_FONT->ft_h*16+3*16,"total=%iK",(colorsize+depthsize+truebytes)/1024);
  }   }
Line 1041
 
Line 1083
 // unsigned char *oldpal;  // unsigned char *oldpal;
  r_ubitbltc++;   r_ubitbltc++;
   
  ogl_init_texture(&tex);   ogl_init_texture(&tex, sw, sh, OGL_FLAG_ALPHA);
  tex.w=sw;tex.h=sh;   tex.prio=0.0;
  tex.prio=0.0;tex.wantmip=0;  
  tex.lw=src->bm_rowsize;   tex.lw=src->bm_rowsize;
   
 /* if (w==src->bm_w && sx==0){  /* if (w==src->bm_w && sx==0){
Line 1335
 
Line 1376
   
 //GLubyte texbuf[512*512*4];  //GLubyte texbuf[512*512*4];
 GLubyte texbuf[OGLTEXBUFSIZE];  GLubyte texbuf[OGLTEXBUFSIZE];
 void ogl_filltexbuf(unsigned char *data,GLubyte *texp,int truewidth,int width,int height,int dxo,int dyo,int twidth,int theight,int type)  void ogl_filltexbuf(unsigned char *data,GLubyte *texp,int truewidth,int width,int height,int dxo,int dyo,int twidth,int theight,int type, int bm_flags)
 {  {
 // GLushort *tex=(GLushort *)texp;  // GLushort *tex=(GLushort *)texp;
  int x,y,c,i;   int x,y,c,i;
Line 1349
 
Line 1390
  if (x<width && y<height)   if (x<width && y<height)
  c=data[i++];   c=data[i++];
  else   else
  c=255;//fill the pad space with transparancy   c=256;//fill the pad space with transparancy
  if (c==255){   if ((c==255 && (bm_flags&BM_FLAG_TRANSPARENT)) || c==256){
  switch (type){   switch (type){
  case GL_LUMINANCE:   case GL_LUMINANCE:
  (*(texp++))=0;   (*(texp++))=0;
Line 1359
 
Line 1400
  (*(texp++))=0;   (*(texp++))=0;
  (*(texp++))=0;   (*(texp++))=0;
  break;   break;
    case GL_RGB:
    (*(texp++))=0;
    (*(texp++))=0;
    (*(texp++))=0;
    break;
  case GL_RGBA:   case GL_RGBA:
  (*(texp++))=0;   (*(texp++))=0;
  (*(texp++))=0;   (*(texp++))=0;
Line 1382
 
Line 1428
  (*(texp++))=255;   (*(texp++))=255;
  (*(texp++))=255;   (*(texp++))=255;
  break;   break;
    case GL_RGB:
    (*(texp++))=ogl_pal[c*3]*4;
    (*(texp++))=ogl_pal[c*3+1]*4;
    (*(texp++))=ogl_pal[c*3+2]*4;
    break;
  case GL_RGBA:   case GL_RGBA:
  //(*(texp++))=gr_palette[c*3]*4;   //(*(texp++))=gr_palette[c*3]*4;
  //(*(texp++))=gr_palette[c*3+1]*4;   //(*(texp++))=gr_palette[c*3+1]*4;
Line 1420
 
Line 1471
  break;   break;
  }//note how it will fall through here if the statement is false   }//note how it will fall through here if the statement is false
  case GL_RGBA2:   case GL_RGBA2:
  tex->internalformat=ogl_rgba_format;   tex->internalformat=ogl_rgba_internalformat;
  tex->format=GL_RGBA;   tex->format=GL_RGBA;
  break;   break;
  default:   default:
Line 1475
 
Line 1526
  case GL_LUMINANCE_ALPHA:   case GL_LUMINANCE_ALPHA:
  bi=8;   bi=8;
  break;   break;
    case GL_RGB:
  case GL_RGBA:   case GL_RGBA:
  bi=16;   bi=16;
  break;   break;
Line 1510
 
Line 1562
  tex->v=(float)tex->h/(float)tex->th;   tex->v=(float)tex->h/(float)tex->th;
   
 #ifdef GL_EXT_paletted_texture  #ifdef GL_EXT_paletted_texture
  if (ogl_shared_palette_ok && tex->format==GL_RGBA &&    if (ogl_shared_palette_ok && (tex->format==GL_RGBA || tex->format==GL_RGB) &&
  !(tex->wantmip && GL_needmipmaps) // gluBuild2DMipmaps doesn't support paletted textures.. this could be worked around be generating our own mipmaps, but thats too much trouble at the moment.   !(tex->wantmip && GL_needmipmaps) // gluBuild2DMipmaps doesn't support paletted textures.. this could be worked around be generating our own mipmaps, but thats too much trouble at the moment.
  ) {   ) {
  //descent makes palette entries 254 and 255 both do double duty, depending upon the setting of BM_FLAG_SUPER_TRANSPARENT and BM_FLAG_TRANSPARENT.   //descent makes palette entries 254 and 255 both do double duty, depending upon the setting of BM_FLAG_SUPER_TRANSPARENT and BM_FLAG_TRANSPARENT.
Line 1534
 
Line 1586
   
  // if (width!=twidth || height!=theight)   // if (width!=twidth || height!=theight)
  // glmprintf((0,"sizing %ix%i texture up to %ix%i\n",width,height,twidth,theight));   // glmprintf((0,"sizing %ix%i texture up to %ix%i\n",width,height,twidth,theight));
  ogl_filltexbuf(data,texbuf,tex->lw,tex->w,tex->h,dxo,dyo,tex->tw,tex->th,tex->format);   ogl_filltexbuf(data,texbuf,tex->lw,tex->w,tex->h,dxo,dyo,tex->tw,tex->th,tex->format,bm_flags);
   
  // Generate OpenGL texture IDs.   // Generate OpenGL texture IDs.
  glGenTextures(1, &tex->handle);   glGenTextures(1, &tex->handle);
Line 1575
 
Line 1627
   
 }  }
 unsigned char decodebuf[512*512];  unsigned char decodebuf[512*512];
 void ogl_loadbmtexture_m(grs_bitmap *bm,int domipmap){  void ogl_loadbmtexture_f(grs_bitmap *bm, int flags){
  unsigned char *buf;   unsigned char *buf;
  while (bm->bm_parent)   while (bm->bm_parent)
  bm=bm->bm_parent;   bm=bm->bm_parent;
  buf=bm->bm_data;   buf=bm->bm_data;
  if (bm->gltexture==NULL){   if (bm->gltexture==NULL){
  ogl_init_texture(bm->gltexture=ogl_get_free_texture());   ogl_init_texture(bm->gltexture=ogl_get_free_texture(), bm->bm_w, bm->bm_h, flags | ((bm->bm_flags&BM_FLAG_TRANSPARENT)?OGL_FLAG_ALPHA:0));
  bm->gltexture->lw=bm->bm_w;  
  bm->gltexture->w=bm->bm_w;  
  bm->gltexture->h=bm->bm_h;  
  bm->gltexture->wantmip=domipmap;  
  }   }
  else {   else {
  if (bm->gltexture->handle>0)   if (bm->gltexture->handle>0)
Line 1613
 
Line 1661
  ogl_loadtexture(buf,0,0,bm->gltexture,bm->bm_flags);   ogl_loadtexture(buf,0,0,bm->gltexture,bm->bm_flags);
 }  }
 void ogl_loadbmtexture(grs_bitmap *bm){  void ogl_loadbmtexture(grs_bitmap *bm){
  ogl_loadbmtexture_m(bm,1);   ogl_loadbmtexture_f(bm, OGL_FLAG_MIPMAP);
 }  }
 void ogl_freetexture(ogl_texture *gltexture){  void ogl_freetexture(ogl_texture *gltexture){
  if (gltexture->handle>0){   if (gltexture->handle>0){
Line 1621
 
Line 1669
  glmprintf((0,"ogl_freetexture(%p):%i (last rend %is) (%i left)\n",gltexture,gltexture->handle,(GameTime-gltexture->lastrend)/f1_0,r_texcount));   glmprintf((0,"ogl_freetexture(%p):%i (last rend %is) (%i left)\n",gltexture,gltexture->handle,(GameTime-gltexture->lastrend)/f1_0,r_texcount));
  glDeleteTextures( 1, &gltexture->handle );   glDeleteTextures( 1, &gltexture->handle );
 // gltexture->handle=0;  // gltexture->handle=0;
  ogl_init_texture(gltexture);   ogl_reset_texture(gltexture);
  }   }
 }  }
 void ogl_freebmtexture(grs_bitmap *bm){  void ogl_freebmtexture(grs_bitmap *bm){

Legend:
line(s) removed in v.1.39 
line(s) changed
 line(s) added in v.1.40
File made using version 1.97 of cvs2html by btb at 2005-02-24 14:57