diff options
Diffstat (limited to 'src/libGLESv2/Context.cpp')
| -rw-r--r-- | src/libGLESv2/Context.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp index 2b936317..985a7569 100644 --- a/src/libGLESv2/Context.cpp +++ b/src/libGLESv2/Context.cpp @@ -1391,7 +1391,7 @@ void Context::applyShaders(ProgramBinary *programBinary, bool transformFeedbackA { const VertexAttribute *vertexAttributes = mState.getVertexArray()->getVertexAttributes(); - VertexFormat inputLayout[gl::MAX_VERTEX_ATTRIBS]; + VertexFormat inputLayout[MAX_VERTEX_ATTRIBS]; VertexFormat::GetInputLayout(inputLayout, programBinary, vertexAttributes, mState.getVertexAttribCurrentValues()); const Framebuffer *fbo = mState.getDrawFramebuffer(); @@ -1488,7 +1488,7 @@ bool Context::applyUniformBuffers() Program *programObject = getProgram(mState.getCurrentProgramId()); ProgramBinary *programBinary = programObject->getProgramBinary(); - std::vector<gl::Buffer*> boundBuffers; + std::vector<Buffer*> boundBuffers; for (unsigned int uniformBlockIndex = 0; uniformBlockIndex < programBinary->getActiveUniformBlockCount(); uniformBlockIndex++) { @@ -1677,7 +1677,7 @@ Error Context::clearBufferfi(GLenum buffer, int drawbuffer, float depth, int ste Error Context::readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei *bufSize, void* pixels) { - gl::Framebuffer *framebuffer = mState.getReadFramebuffer(); + Framebuffer *framebuffer = mState.getReadFramebuffer(); GLenum sizedInternalFormat = GetSizedInternalFormat(format, type); const InternalFormat &sizedFormatInfo = GetInternalFormatInfo(sizedInternalFormat); @@ -2232,14 +2232,16 @@ size_t Context::getBoundFramebufferTextureSerials(FramebufferTextureSerialArray FramebufferAttachment *attachment = drawFramebuffer->getColorbuffer(i); if (attachment && attachment->isTexture()) { - (*outSerialArray)[serialCount++] = attachment->getTextureSerial(); + Texture *texture = attachment->getTexture(); + (*outSerialArray)[serialCount++] = texture->getTextureSerial(); } } FramebufferAttachment *depthStencilAttachment = drawFramebuffer->getDepthOrStencilbuffer(); if (depthStencilAttachment && depthStencilAttachment->isTexture()) { - (*outSerialArray)[serialCount++] = depthStencilAttachment->getTextureSerial(); + Texture *depthStencilTexture = depthStencilAttachment->getTexture(); + (*outSerialArray)[serialCount++] = depthStencilTexture->getTextureSerial(); } std::sort(outSerialArray->begin(), outSerialArray->begin() + serialCount); @@ -2269,11 +2271,11 @@ void Context::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1 blitDepth = true; } - gl::Rectangle srcRect(srcX0, srcY0, srcX1 - srcX0, srcY1 - srcY0); - gl::Rectangle dstRect(dstX0, dstY0, dstX1 - dstX0, dstY1 - dstY0); + Rectangle srcRect(srcX0, srcY0, srcX1 - srcX0, srcY1 - srcY0); + Rectangle dstRect(dstX0, dstY0, dstX1 - dstX0, dstY1 - dstY0); if (blitRenderTarget || blitDepth || blitStencil) { - const gl::Rectangle *scissor = mState.isScissorTestEnabled() ? &mState.getScissor() : NULL; + const Rectangle *scissor = mState.isScissorTestEnabled() ? &mState.getScissor() : NULL; mRenderer->blitRect(readFramebuffer, srcRect, drawFramebuffer, dstRect, scissor, blitRenderTarget, blitDepth, blitStencil, filter); } |