Enable more paths

This commit is contained in:
jpaana 2004-03-24 00:22:49 +00:00
parent df5b42137c
commit c7b646d5b3
2 changed files with 277 additions and 281 deletions

View file

@ -322,7 +322,8 @@ void CheckARBFragmentExtensions(void)
}
}
void CheckNV3xFragmentExtensions(void) {
void CheckNV3xFragmentExtensions(void)
{
int supportedTmu;
glGetIntegerv(GL_MAX_ACTIVE_TEXTURES_ARB,&supportedTmu);
@ -403,7 +404,7 @@ void CheckAnisotropicExtension(void)
{
GLfloat maxanisotropy;
if ( COM_CheckParm ("-anisotropy"))
if ( COM_CheckParm ("-anisotropy"))
gl_textureanisotropylevel = Q_atoi(com_argv[COM_CheckParm("-anisotropy")+1]);
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxanisotropy);
@ -456,7 +457,6 @@ static int supportedTmu;
*/
void GL_Init (void)
{
gl_vendor = glGetString (GL_VENDOR);
Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
gl_renderer = glGetString (GL_RENDERER);
@ -519,15 +519,15 @@ void GL_Init (void)
//having invalid function pointers called...
switch (gl_cardtype)
{
/*case GENERIC:
case GENERIC:
Con_Printf ("Using generic path.\n");
// Sys_Error("No generic path yet\n");
BUMP_InitGeneric();
Sys_Error("No working generic path yet\n");
// BUMP_InitGeneric();
break;
case GEFORCE:
Con_Printf ("Using GeForce 1/2/4-MX path\n");
// Sys_Error("No geforce2 path yet\n");
BUMP_InitGeneric(); // has optimizations for GF cards (some day :)
Sys_Error("No working geforce2 path yet\n");
// BUMP_InitGeneric(); // has optimizations for GF cards (some day :)
break;
case GEFORCE3:
Con_Printf ("Using GeForce 3/4 path\n");
@ -540,19 +540,19 @@ void GL_Init (void)
case PARHELIA:
Con_Printf ("Using Parhelia path.\n");
BUMP_InitParhelia();
break;*/
break;
case ARB:
Con_Printf ("Using ARB_fragment_program path.\n");
BUMP_InitARB();
break;
/*case NV3x:
case NV3x:
Con_Printf ("Using NV_fragment_program path.\n");
BUMP_InitNV3x();
break;
case GL2:
Con_Printf ("Using GL2 path.\n");
BUMP_InitGL2();
break;*/
break;
}
GL_InitDriverMem();
@ -591,7 +591,8 @@ extern qboolean mtexenabled;
To get rid of state changes once and for all
Don't call this too often tough...
*/
void GL_SetupDefaultState(void) {
void GL_SetupDefaultState(void)
{
int i;
glMatrixMode(GL_TEXTURE);

View file

@ -232,8 +232,7 @@
<File
RelativePath="..\gl_bumpgf.c">
<FileConfiguration
Name="GL Debug|Win32"
ExcludedFromBuild="TRUE">
Name="GL Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
@ -247,8 +246,7 @@
<File
RelativePath="..\gl_bumpgl2.c">
<FileConfiguration
Name="GL Debug|Win32"
ExcludedFromBuild="TRUE">
Name="GL Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
@ -265,8 +263,7 @@
<File
RelativePath="..\gl_bumpnv3x.c">
<FileConfiguration
Name="GL Debug|Win32"
ExcludedFromBuild="TRUE">
Name="GL Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
@ -280,8 +277,7 @@
<File
RelativePath="..\gl_bumpparhelia.c">
<FileConfiguration
Name="GL Debug|Win32"
ExcludedFromBuild="TRUE">
Name="GL Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
@ -295,8 +291,7 @@
<File
RelativePath="..\gl_bumpradeon.c">
<FileConfiguration
Name="GL Debug|Win32"
ExcludedFromBuild="TRUE">
Name="GL Debug|Win32">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>