|
@@ -134,7 +134,8 @@ void GFXGLDevice::initGLState()
|
|
mCardProfiler = new GFXGLCardProfiler();
|
|
mCardProfiler = new GFXGLCardProfiler();
|
|
mCardProfiler->init();
|
|
mCardProfiler->init();
|
|
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, (GLint*)&mMaxShaderTextures);
|
|
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, (GLint*)&mMaxShaderTextures);
|
|
- glGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&mMaxFFTextures);
|
|
|
|
|
|
+ // JTH: Needs removed, ffp
|
|
|
|
+ //glGetIntegerv(GL_MAX_TEXTURE_UNITS, (GLint*)&mMaxFFTextures);
|
|
glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, (GLint*)&mMaxTRColors);
|
|
glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, (GLint*)&mMaxTRColors);
|
|
mMaxTRColors = getMin( mMaxTRColors, (U32)(GFXTextureTarget::MaxRenderSlotId-1) );
|
|
mMaxTRColors = getMin( mMaxTRColors, (U32)(GFXTextureTarget::MaxRenderSlotId-1) );
|
|
|
|
|
|
@@ -641,7 +642,7 @@ void GFXGLDevice::setLightMaterialInternal(const GFXLightMaterial mat)
|
|
|
|
|
|
void GFXGLDevice::setGlobalAmbientInternal(ColorF color)
|
|
void GFXGLDevice::setGlobalAmbientInternal(ColorF color)
|
|
{
|
|
{
|
|
- glLightModelfv(GL_LIGHT_MODEL_AMBIENT, (GLfloat*)&color);
|
|
|
|
|
|
+ // ONLY NEEDED ON FFP
|
|
}
|
|
}
|
|
|
|
|
|
void GFXGLDevice::setTextureInternal(U32 textureUnit, const GFXTextureObject*texture)
|
|
void GFXGLDevice::setTextureInternal(U32 textureUnit, const GFXTextureObject*texture)
|
|
@@ -697,12 +698,12 @@ void GFXGLDevice::setClipRect( const RectI &inRect )
|
|
const F32 right = mClip.point.x + mClip.extent.x;
|
|
const F32 right = mClip.point.x + mClip.extent.x;
|
|
const F32 bottom = mClip.extent.y;
|
|
const F32 bottom = mClip.extent.y;
|
|
const F32 top = 0.0f;
|
|
const F32 top = 0.0f;
|
|
- const F32 near = 0.0f;
|
|
|
|
- const F32 far = 1.0f;
|
|
|
|
|
|
+ const F32 nearPlane = 0.0f;
|
|
|
|
+ const F32 farPlane = 1.0f;
|
|
|
|
|
|
const F32 tx = -(right + left)/(right - left);
|
|
const F32 tx = -(right + left)/(right - left);
|
|
const F32 ty = -(top + bottom)/(top - bottom);
|
|
const F32 ty = -(top + bottom)/(top - bottom);
|
|
- const F32 tz = -(far + near)/(far - near);
|
|
|
|
|
|
+ const F32 tz = -(farPlane + nearPlane)/(farPlane - nearPlane);
|
|
|
|
|
|
static Point4F pt;
|
|
static Point4F pt;
|
|
pt.set(2.0f / (right - left), 0.0f, 0.0f, 0.0f);
|
|
pt.set(2.0f / (right - left), 0.0f, 0.0f, 0.0f);
|
|
@@ -711,7 +712,7 @@ void GFXGLDevice::setClipRect( const RectI &inRect )
|
|
pt.set(0.0f, 2.0f/(top - bottom), 0.0f, 0.0f);
|
|
pt.set(0.0f, 2.0f/(top - bottom), 0.0f, 0.0f);
|
|
mProjectionMatrix.setColumn(1, pt);
|
|
mProjectionMatrix.setColumn(1, pt);
|
|
|
|
|
|
- pt.set(0.0f, 0.0f, -2.0f/(far - near), 0.0f);
|
|
|
|
|
|
+ pt.set(0.0f, 0.0f, -2.0f/(farPlane - nearPlane), 0.0f);
|
|
mProjectionMatrix.setColumn(2, pt);
|
|
mProjectionMatrix.setColumn(2, pt);
|
|
|
|
|
|
pt.set(tx, ty, tz, 1.0f);
|
|
pt.set(tx, ty, tz, 1.0f);
|