Difference for arch/ogl/gr.c from version 1.22 to 1.23


version 1.22 version 1.23
Line 123
 
Line 123
    
  printf("gl vendor:%s renderer:%s version:%s extensions:%s\n",gl_vendor,gl_renderer,gl_version,gl_extensions);   printf("gl vendor:%s renderer:%s version:%s extensions:%s\n",gl_vendor,gl_renderer,gl_version,gl_extensions);
   
  ogl_intensity4_ok=1;ogl_luminance4_alpha4_ok=1;ogl_rgba2_ok=1;   ogl_intensity4_ok=1;ogl_luminance4_alpha4_ok=1;ogl_rgba2_ok=1;ogl_gettexlevelparam_ok=1;
   
   #ifdef __WINDOWS__
    dglMultiTexCoord2fARB = (glMultiTexCoord2fARB_fp)wglGetProcAddress("glMultiTexCoord2fARB");
    dglActiveTextureARB = (glActiveTextureARB_fp)wglGetProcAddress("glActiveTextureARB");
    dglMultiTexCoord2fSGIS = (glMultiTexCoord2fSGIS_fp)wglGetProcAddress("glMultiTexCoord2fSGIS");
    dglSelectTextureSGIS = (glSelectTextureSGIS_fp)wglGetProcAddress("glSelectTextureSGIS");
   #endif
   
    //multitexturing doesn't work yet.
   #ifdef GL_ARB_multitexture
    ogl_arb_multitexture_ok=0;//(strstr(gl_extensions,"GL_ARB_multitexture")!=0 && glActiveTextureARB!=0 && 0);
   #endif
   #ifdef GL_SGIS_multitexture
    ogl_sgis_multitexture_ok=0;//(strstr(gl_extensions,"GL_SGIS_multitexture")!=0 && glSelectTextureSGIS!=0 && 0);
   #endif
    mprintf((0,"a:%p b:%p\n",strstr(gl_extensions,"GL_SGIS_multitexture"),glSelectTextureSGIS));
    mprintf((0,"c:%p d:%p e:%p\n",strstr(gl_extensions,"GL_ARB_multitexture"),glActiveTextureARB,glBegin));
    
  //add driver specific hacks here.  whee.   //add driver specific hacks here.  whee.
  if (stricmp(gl_renderer,"Mesa NVIDIA RIVA 1.0\n")==0 && stricmp(gl_version,"1.2 Mesa 3.0")==0){   if ((stricmp(gl_renderer,"Mesa NVIDIA RIVA 1.0\n")==0 || stricmp(gl_renderer,"Mesa NVIDIA RIVA 1.2\n")==0) && stricmp(gl_version,"1.2 Mesa 3.0")==0){
  ogl_intensity4_ok=0;//ignores alpha, always black background instead of transparent.   ogl_intensity4_ok=0;//ignores alpha, always black background instead of transparent.
  ogl_readpixels_ok=0;//either just returns all black, or kills the X server entirely   ogl_readpixels_ok=0;//either just returns all black, or kills the X server entirely
    ogl_gettexlevelparam_ok=0;//returns random data..
  }   }
   
  //allow overriding of stuff.   //allow overriding of stuff.
   #ifdef GL_ARB_multitexture
    if ((t=FindArg("-gl_arb_multitexture_ok"))){
    ogl_arb_multitexture_ok=atoi(Args[t+1]);
    }
   #endif
   #ifdef GL_SGIS_multitexture
    if ((t=FindArg("-gl_sgis_multitexture_ok"))){
    ogl_sgis_multitexture_ok=atoi(Args[t+1]);
    }
   #endif
  if ((t=FindArg("-gl_intensity4_ok"))){   if ((t=FindArg("-gl_intensity4_ok"))){
  ogl_intensity4_ok=atoi(Args[t+1]);   ogl_intensity4_ok=atoi(Args[t+1]);
  }   }
Line 144
 
Line 172
  if ((t=FindArg("-gl_readpixels_ok"))){   if ((t=FindArg("-gl_readpixels_ok"))){
  ogl_readpixels_ok=atoi(Args[t+1]);   ogl_readpixels_ok=atoi(Args[t+1]);
  }   }
    if ((t=FindArg("-gl_gettexlevelparam_ok"))){
    ogl_gettexlevelparam_ok=atoi(Args[t+1]);
    }
   
  printf("gl_intensity4:%i gl_luminance4_alpha4:%i gl_rgba2:%i gl_readpixels:%i\n",ogl_intensity4_ok,ogl_luminance4_alpha4_ok,ogl_rgba2_ok,ogl_readpixels_ok);   printf("gl_arb_multitexture:%i gl_sgis_multitexture:%i\n",ogl_arb_multitexture_ok,ogl_sgis_multitexture_ok);
    printf("gl_intensity4:%i gl_luminance4_alpha4:%i gl_rgba2:%i gl_readpixels:%i gl_gettexlevelparam:%i\n",ogl_intensity4_ok,ogl_luminance4_alpha4_ok,ogl_rgba2_ok,ogl_readpixels_ok,ogl_gettexlevelparam_ok);
 }  }
   
 int gr_set_mode(u_int32_t mode)  int gr_set_mode(u_int32_t mode)

Legend:
line(s) removed in v.1.22 
line(s) changed
 line(s) added in v.1.23