Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update disabled IsReallyAClear() code.

Browse source 
Not sure if there's still something wrong about depth.
This commit is contained in:
Unknown W. Brackets 2014-05-31 13:07:19 -07:00
parent c142207a93
commit b308aaad03
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GPU/GLES/Framebuffer.cpp
View file

@ -528,6 +528,7 @@ void FramebufferManager::DrawPlainColor(u32 color) {
glEnableVertexAttribArray(program->a_position);
glVertexAttribPointer(program->a_position, 3, GL_FLOAT, GL_FALSE, 12, pos);
glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_BYTE, indices);
// TODO: Really disable this?
glDisableVertexAttribArray(program->a_position);
glsl_unbind();
@ -602,6 +603,7 @@ void FramebufferManager::DrawActiveTexture(GLuint texture, float x, float y, flo
glVertexAttribPointer(program->a_position, 3, GL_FLOAT, GL_FALSE, 12, pos);
glVertexAttribPointer(program->a_texcoord0, 2, GL_FLOAT, GL_FALSE, 8, texCoords);
glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, indices);
// TODO: Really disable these?
glDisableVertexAttribArray(program->a_position);
glDisableVertexAttribArray(program->a_texcoord0);

44
GPU/GLES/SoftwareTransform.cpp
View file

@ -23,6 +23,7 @@
#include "GPU/Math3D.h"
#include "GPU/Common/VertexDecoderCommon.h"
#include "GPU/Common/TransformCommon.h"
#include "GPU/GLES/Framebuffer.h"
#include "GPU/GLES/ShaderManager.h"
#include "GPU/GLES/TransformPipeline.h"
@ -88,8 +89,7 @@ bool TransformDrawEngine::IsReallyAClear(int numVerts) const {
if (transformed[0].x != 0.0f || transformed[0].y != 0.0f)
return false;
u32 matchcolor;
memcpy(&matchcolor, transformed[0].color0, 4);
u32 matchcolor = transformed[0].color0_32;
float matchz = transformed[0].z;
int bufW = gstate_c.curRTWidth;
@ -97,9 +97,7 @@ bool TransformDrawEngine::IsReallyAClear(int numVerts) const {
float prevX = 0.0f;
for (int i = 1; i < numVerts; i++) {
u32 vcolor;
memcpy(&vcolor, transformed[i].color0, 4);
if (vcolor != matchcolor || transformed[i].z != matchz)
if (transformed[i].color0_32 != matchcolor || transformed[i].z != matchz)
return false;
if ((i & 1) == 0) {
@ -386,8 +384,7 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
// An alternative option is to simply ditch all the verts except the first and last to create a single
// rectangle out of many. Quite a small optimization though.
if (false && maxIndex > 1 && gstate.isModeClear() && prim == GE_PRIM_RECTANGLES && IsReallyAClear(maxIndex)) {
u32 clearColor;
memcpy(&clearColor, transformed[0].color0, 4);
u32 clearColor = transformed[0].color0_32;
float clearDepth = transformed[0].z;
const float col[4] = {
((clearColor & 0xFF)) / 255.0f,
@ -398,22 +395,17 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
bool colorMask = gstate.isClearModeColorMask();
bool alphaMask = gstate.isClearModeAlphaMask();
glstate.colorMask.set(colorMask, colorMask, colorMask, alphaMask);
if (alphaMask) {
glstate.stencilTest.set(true);
// Clear stencil
// TODO: extract the stencilValue properly, see below
int stencilValue = 0;
glstate.stencilFunc.set(GL_ALWAYS, stencilValue, 255);
} else {
// Don't touch stencil
glstate.stencilTest.set(false);
}
glstate.scissorTest.set(false);
bool depthMask = gstate.isClearModeDepthMask();
if (depthMask) {
framebufferManager_->SetDepthUpdated();
}
int target = 0;
if (colorMask || alphaMask) target |= GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
glstate.stencilTest.set(false);
glstate.scissorTest.set(false);
GLbitfield target = 0;
if (colorMask || alphaMask) target |= GL_COLOR_BUFFER_BIT;
if (alphaMask) target |= GL_STENCIL_BUFFER_BIT;
if (depthMask) target |= GL_DEPTH_BUFFER_BIT;
glClearColor(col[0], col[1], col[2], col[3]);
@ -422,8 +414,16 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
#else
glClearDepth(clearDepth);
#endif
glClearStencil(0); // TODO - take from alpha?
// Stencil takes alpha.
glClearStencil(clearColor >> 24);
glClear(target);
// TODO: Now we may have enabled vertex arrays with no data.
// This will crash later in DrawActiveTexture(). So we just give it dummy values.
if (program->attrMask & (1 << ATTR_COLOR0)) {
glBindBuffer(GL_ARRAY_BUFFER, 0);
glVertexAttribPointer(ATTR_COLOR0, 4, GL_UNSIGNED_BYTE, GL_TRUE, 4, transformed);
}
return;
}