Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Aug 28, 2003
1 parent 9882885 commit 97abcc4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
23 changes: 3 additions & 20 deletions doomsday/Src/drOpenGL/main.c
Expand Up @@ -1022,20 +1022,6 @@ int DG_Enable(int cap)
enablePalTexExt(DGL_TRUE);
break;

/* case DGL_DETAIL_TEXTURE_MODE:
glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, midGray);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_INTERPOLATE_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB, GL_SRC_COLOR);
glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_CONSTANT_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_ARB, GL_SRC_COLOR);
glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_PRIMARY_COLOR_ARB);
glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB_ARB, GL_SRC_COLOR);
glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE, 1);
glBlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
break;*/

case DGL_TEXTURE0:
case DGL_TEXTURE1:
case DGL_TEXTURE2:
Expand Down Expand Up @@ -1111,11 +1097,6 @@ void DG_Disable(int cap)
enablePalTexExt(DGL_FALSE);
break;

/* case DGL_DETAIL_TEXTURE_MODE:
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
break;*/

case DGL_TEXTURE0:
case DGL_TEXTURE1:
case DGL_TEXTURE2:
Expand Down Expand Up @@ -1203,13 +1184,15 @@ void DG_Func(int func, int param1, int param2)
}
}

/*
//===========================================================================
// DG_ZBias
//===========================================================================
void DG_ZBias(int level)
{
//glDepthRange(level*.0022f, 1);
glDepthRange(level*.0022f, 1);
}
*/

//===========================================================================
// DG_MatrixMode
Expand Down
1 change: 0 additions & 1 deletion doomsday/Src/drOpenGL/texture.c
Expand Up @@ -269,7 +269,6 @@ int grayMipmap(int format, int width, int height, void *data)
if(w > 1) w >>= 1;
if(h > 1) h >>= 1;

// The texture has no mipmapping, just one level.
glTexImage2D(GL_TEXTURE_2D, i + 1, ChooseFormat(1), w, h, 0,
GL_LUMINANCE, GL_UNSIGNED_BYTE, faded);
}
Expand Down

0 comments on commit 97abcc4

Please sign in to comment.