libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-20 17:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #769 from raven02/patch-1

Browse Source 
Add glstate.stencilTest & depthTest.disable()
This commit is contained in:
Henrik Rydgård 2013-02-23 13:53:41 -08:00
commit 77fad413f8
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GPU/GLES/DisplayListInterpreter.cpp
View File

@ -623,6 +623,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) {
case GE_CMD_CLUTADDR:
case GE_CMD_CLUTADDRUPPER:
case GE_CMD_LOADCLUT:
case GE_CMD_CLUTFORMAT:
gstate_c.textureChanged = true;
// This could be used to "dirty" textures with clut.
break;
@ -631,10 +632,6 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) {
case GE_CMD_TEXSHADELS:
break;
case GE_CMD_CLUTFORMAT:
gstate_c.textureChanged = true;
break;
case GE_CMD_TRANSFERSRC:
case GE_CMD_TRANSFERSRCW:
case GE_CMD_TRANSFERDST:

6
GPU/GLES/Framebuffer.cpp
View File

@ -384,6 +384,7 @@ void FramebufferManager::SetRenderFrameBuffer() {
{
glstate.depthWrite.set(GL_TRUE);
glstate.colorMask.set(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearColor(0,0,0,1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
}
#endif
@ -420,7 +421,8 @@ void FramebufferManager::CopyDisplayToOutput() {
glstate.cullFace.disable();
glstate.depthTest.disable();
glstate.scissorTest.disable();
glstate.stencilTest.disable();
fbo_bind_color_as_texture(vfb->fbo, 0);
if (resized_) {
@ -450,6 +452,8 @@ void FramebufferManager::BeginFrame() {
glstate.cullFace.disable();
glstate.depthTest.disable();
glstate.blend.disable();
glstate.scissorTest.disable();
glstate.stencilTest.disable();
DrawPixels(pspframebuf, displayFormat_, displayStride_);
// TODO: restore state?
}

26
GPU/GLES/StateMapping.cpp
View File

@ -164,11 +164,11 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
// Set cull
if (gstate.isModeClear()) {
bool colMask = (gstate.clearmode >> 8) & 1;
bool colorMask = (gstate.clearmode >> 8) & 1;
bool alphaMask = (gstate.clearmode >> 9) & 1;
bool updateZ = (gstate.clearmode >> 10) & 1;
bool depthMask = (gstate.clearmode >> 10) & 1;
glstate.colorMask.set(colMask, colMask, colMask, alphaMask);
glstate.colorMask.set(colorMask, colorMask, colorMask, alphaMask);
glstate.stencilTest.enable();
glstate.stencilOp.set(GL_REPLACE, GL_REPLACE, GL_REPLACE);
@ -176,16 +176,20 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
glstate.depthTest.enable();
glstate.depthFunc.set(GL_ALWAYS);
glstate.depthWrite.set(updateZ ? GL_TRUE : GL_FALSE);
glstate.depthWrite.set(depthMask ? GL_TRUE : GL_FALSE);
} else {
u8 cullMode = gstate.getCullMode();
bool wantCull = !gstate.isModeThrough() && prim != GE_PRIM_RECTANGLES && gstate.isCullEnabled();
glstate.cullFace.set(wantCull);
glstate.cullFaceMode.set(cullingMode[cullMode]);
glstate.depthTest.set(gstate.isDepthTestEnabled());
glstate.depthFunc.set(ztests[gstate.getDepthTestFunc()]);
glstate.depthWrite.set(gstate.isDepthWriteEnabled() ? GL_TRUE : GL_FALSE);
if (gstate.isDepthTestEnabled()) {
glstate.depthTest.enable();
glstate.depthFunc.set(ztests[gstate.getDepthTestFunc()]);
glstate.depthWrite.set(gstate.isDepthWriteEnabled() ? GL_TRUE : GL_FALSE);
} else {
glstate.depthTest.disable();
}
// PSP color/alpha mask is per bit but we can only support per byte.
// But let's do that, at least. And let's try a threshold.
@ -202,7 +206,7 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
(gstate.stenciltest >> 16) & 0xFF); // mask
glstate.stencilOp.set(stencilOps[gstate.stencilop & 0x7], // stencil fail
stencilOps[(gstate.stencilop >> 8) & 0x7], // depth fail
stencilOps[(gstate.stencilop >> 16) & 0x7]);
stencilOps[(gstate.stencilop >> 16) & 0x7]); // depth pass
} else {
glstate.stencilTest.disable();
}
@ -235,7 +239,7 @@ void TransformDrawEngine::UpdateViewportAndProjection() {
if (throughmode) {
// No viewport transform here. Let's experiment with using region.
glstate.viewport.set((0 + regionX1) * renderWidthFactor, (0 - regionY1) * renderHeightFactor, (regionX2 - regionX1) * renderWidthFactor, (regionY2 - regionY1) * renderHeightFactor);
glstate.depthRange.set(0.0, 1.0);
glstate.depthRange.set(0.0f, 1.0f);
} else {
// These we can turn into a glViewport call, offset by offsetX and offsetY. Math after.
float vpXa = getFloat24(gstate.viewportx1);
@ -268,8 +272,8 @@ void TransformDrawEngine::UpdateViewportAndProjection() {
// Sadly, as glViewport takes integers, we will not be able to support sub pixel offsets this way. But meh.
// shaderManager_->DirtyUniform(DIRTY_PROJMATRIX);
float zScale = getFloat24(gstate.viewportz1) / 65535.f;
float zOff = getFloat24(gstate.viewportz2) / 65535.f;
float zScale = getFloat24(gstate.viewportz1) / 65535.0f;
float zOff = getFloat24(gstate.viewportz2) / 65535.0f;
float depthRangeMin = zOff - zScale;
float depthRangeMax = zOff + zScale;
glstate.depthRange.set(depthRangeMin, depthRangeMax);