Removed the mRenderTargetDesc member from Context.

TRAC #22145 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1519 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 4c4ce233
...@@ -1715,29 +1715,6 @@ bool Context::applyRenderTarget(bool ignoreViewport) ...@@ -1715,29 +1715,6 @@ bool Context::applyRenderTarget(bool ignoreViewport)
mRenderer->applyRenderTarget(framebufferObject); mRenderer->applyRenderTarget(framebufferObject);
// storing the mRenderTargetDesc in Context will be removed once refactoring
// of clear is complete
// D3D9_REPLACE start
gl::Renderbuffer *renderbufferObject = NULL;
if (framebufferObject->getColorbufferType() != GL_NONE)
{
renderbufferObject = framebufferObject->getColorbuffer();
}
else
{
renderbufferObject = framebufferObject->getNullColorbuffer();
}
if (!renderbufferObject)
{
ERR("unable to locate renderbuffer for FBO.");
return false;
}
mRenderTargetDesc.width = renderbufferObject->getWidth();
mRenderTargetDesc.height = renderbufferObject->getHeight();
mRenderTargetDesc.format = renderbufferObject->getActualFormat();
// D3D9_REPLACE end
ProgramBinary *programBinary = mState.currentProgram ? getCurrentProgramBinary() : NULL; ProgramBinary *programBinary = mState.currentProgram ? getCurrentProgramBinary() : NULL;
if (!mRenderer->setViewport(mState.viewport, mState.zNear, mState.zFar, ignoreViewport, if (!mRenderer->setViewport(mState.viewport, mState.zNear, mState.zFar, ignoreViewport,
programBinary, mDxUniformsDirty)) programBinary, mDxUniformsDirty))
......
...@@ -490,7 +490,6 @@ class Context ...@@ -490,7 +490,6 @@ class Context
unsigned int mAppliedTextureSerialPS[MAX_TEXTURE_IMAGE_UNITS]; unsigned int mAppliedTextureSerialPS[MAX_TEXTURE_IMAGE_UNITS];
unsigned int mAppliedTextureSerialVS[MAX_VERTEX_TEXTURE_IMAGE_UNITS_VTF]; unsigned int mAppliedTextureSerialVS[MAX_VERTEX_TEXTURE_IMAGE_UNITS_VTF];
unsigned int mAppliedProgramBinarySerial; unsigned int mAppliedProgramBinarySerial;
rx::RenderTarget::Desc mRenderTargetDesc;
bool mDxUniformsDirty; bool mDxUniformsDirty;
BindingPointer<ProgramBinary> mCurrentProgramBinary; BindingPointer<ProgramBinary> mCurrentProgramBinary;
Framebuffer *mBoundDrawFramebuffer; Framebuffer *mBoundDrawFramebuffer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment