mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 11:03:45 +01:00
Implement basic screen rotation as requested in #297 . Does not work correctly in non-buffered rendering yet.
This commit is contained in:
1 parent
5d0d67140f
commit
3f7830743a
9 files changed
+119
-123
No files matched your search
+29
-54
@@ -100,53 +100,6 @@ static const char color_vs[] =
|
||||
|
||||
void ConvertFromRGBA8888(u8 *dst, const u8 *src, u32 dstStride, u32 srcStride, u32 width, u32 height, GEBufferFormat format);
|
||||
|
||||
void CenterRect(float *x, float *y, float *w, float *h,
|
||||
float origW, float origH, float frameW, float frameH) {
|
||||
float outW;
|
||||
float outH;
|
||||
|
||||
if (g_Config.bStretchToDisplay) {
|
||||
outW = frameW;
|
||||
outH = frameH;
|
||||
} else {
|
||||
// Add special case for 1080p displays, cutting off the bottom and top 1-pixel rows from the original 480x272.
|
||||
// This will be what 99.9% of users want.
|
||||
if (origW == 480 && origH == 272 && frameW == 1920 && frameH == 1080) {
|
||||
*x = 0;
|
||||
*y = -4;
|
||||
*w = 1920;
|
||||
*h = 1088;
|
||||
return;
|
||||
}
|
||||
|
||||
float origRatio = origW / origH;
|
||||
float frameRatio = frameW / frameH;
|
||||
if (origRatio > frameRatio) {
|
||||
// Image is wider than frame. Center vertically.
|
||||
outW = frameW;
|
||||
outH = frameW / origRatio;
|
||||
// Stretch a little bit
|
||||
if (g_Config.bPartialStretch)
|
||||
outH = (frameH + outH) / 2.0f; // (408 + 720) / 2 = 564
|
||||
}
|
||||
else {
|
||||
// Image is taller than frame. Center horizontally.
|
||||
outW = frameH * origRatio;
|
||||
outH = frameH;
|
||||
}
|
||||
}
|
||||
|
||||
if (g_Config.bSmallDisplay) {
|
||||
outW /= 2.0f;
|
||||
outH /= 2.0f;
|
||||
}
|
||||
|
||||
*x = (frameW - outW) / 2.0f;
|
||||
*y = (frameH - outH) / 2.0f;
|
||||
*w = outW;
|
||||
*h = outH;
|
||||
}
|
||||
|
||||
void FramebufferManager::ClearBuffer() {
|
||||
glstate.scissorTest.disable();
|
||||
glstate.depthWrite.set(GL_TRUE);
|
||||
@@ -467,13 +420,14 @@ void FramebufferManager::DrawFramebuffer(const u8 *srcPixels, GEBufferFormat src
|
||||
// (it always runs at output resolution so FXAA may look odd).
|
||||
float x, y, w, h;
|
||||
CenterRect(&x, &y, &w, &h, 480.0f, 272.0f, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight);
|
||||
int uvRotation = g_Config.iInternalScreenRotation;
|
||||
if (cardboardSettings.enabled) {
|
||||
// Left Eye Image
|
||||
glstate.viewport.set(cardboardSettings.leftEyeXPosition, cardboardSettings.screenYPosition, cardboardSettings.screenWidth, cardboardSettings.screenHeight);
|
||||
if (applyPostShader && usePostShader_ && useBufferedRendering_) {
|
||||
DrawActiveTexture(0, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, false, 0.0f, 0.0f, 480.0f / 512.0f, 1.0f, postShaderProgram_);
|
||||
} else {
|
||||
DrawActiveTexture(0, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, false, 0.0f, 0.0f, 480.0f / 512.0f);
|
||||
DrawActiveTexture(0, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, false, 0.0f, 0.0f, 480.0f / 512.0f, 1.0f);
|
||||
}
|
||||
|
||||
// Right Eye Image
|
||||
@@ -487,9 +441,9 @@ void FramebufferManager::DrawFramebuffer(const u8 *srcPixels, GEBufferFormat src
|
||||
// Fullscreen Image
|
||||
glstate.viewport.set(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
|
||||
if (applyPostShader && usePostShader_ && useBufferedRendering_) {
|
||||
DrawActiveTexture(0, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, false, 0.0f, 0.0f, 480.0f / 512.0f, 1.0f, postShaderProgram_);
|
||||
DrawActiveTexture(0, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, false, 0.0f, 0.0f, 480.0f / 512.0f, 1.0f, postShaderProgram_, uvRotation);
|
||||
} else {
|
||||
DrawActiveTexture(0, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, false, 0.0f, 0.0f, 480.0f / 512.0f);
|
||||
DrawActiveTexture(0, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, false, 0.0f, 0.0f, 480.0f / 512.0f, 1.0f, NULL, uvRotation);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -533,15 +487,36 @@ void FramebufferManager::DrawPlainColor(u32 color) {
|
||||
}
|
||||
|
||||
// x, y, w, h are relative coordinates against destW/destH, which is not very intuitive.
|
||||
void FramebufferManager::DrawActiveTexture(GLuint texture, float x, float y, float w, float h, float destW, float destH, bool flip, float u0, float v0, float u1, float v1, GLSLProgram *program) {
|
||||
void FramebufferManager::DrawActiveTexture(GLuint texture, float x, float y, float w, float h, float destW, float destH, bool flip, float u0, float v0, float u1, float v1, GLSLProgram *program, int uvRotation) {
|
||||
if (flip) {
|
||||
// We're flipping, so 0 is downward. Reverse everything from 1.0f.
|
||||
v0 = 1.0f - v0;
|
||||
v1 = 1.0f - v1;
|
||||
}
|
||||
const float texCoords[8] = {u0,v0, u1,v0, u1,v1, u0,v1};
|
||||
|
||||
float texCoords[8] = {
|
||||
u0,v0,
|
||||
u1,v0,
|
||||
u1,v1,
|
||||
u0,v1
|
||||
};
|
||||
|
||||
static const GLushort indices[4] = {0,1,3,2};
|
||||
|
||||
if (uvRotation != ROTATION_LOCKED_HORIZONTAL) {
|
||||
float temp[8];
|
||||
int rotation = 0;
|
||||
switch (uvRotation) {
|
||||
case ROTATION_LOCKED_HORIZONTAL180: rotation = 4; break;
|
||||
case ROTATION_LOCKED_VERTICAL: rotation = 2; break;
|
||||
case ROTATION_LOCKED_VERTICAL180: rotation = 6; break;
|
||||
}
|
||||
for (int i = 0; i < 8; i++) {
|
||||
temp[i] = texCoords[(i + rotation) & 7];
|
||||
}
|
||||
memcpy(texCoords, temp, sizeof(temp));
|
||||
}
|
||||
|
||||
if (texture) {
|
||||
// We know the texture, we can do a DrawTexture shortcut on nvidia.
|
||||
#if defined(ANDROID)
|
||||
@@ -1097,7 +1072,7 @@ void FramebufferManager::CopyDisplayToOutput() {
|
||||
} else {
|
||||
// Fullscreen Image
|
||||
glstate.viewport.set(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
|
||||
DrawActiveTexture(colorTexture, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, true, u0, v0, u1, v1);
|
||||
DrawActiveTexture(colorTexture, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, true, u0, v0, u1, v1, NULL, g_Config.iInternalScreenRotation);
|
||||
}
|
||||
} else if (usePostShader_ && extraFBOs_.size() == 1 && !postShaderAtOutputResolution_) {
|
||||
// An additional pass, post-processing shader to the extra FBO.
|
||||
@@ -1148,7 +1123,7 @@ void FramebufferManager::CopyDisplayToOutput() {
|
||||
} else {
|
||||
// Fullscreen Image
|
||||
glstate.viewport.set(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
|
||||
DrawActiveTexture(colorTexture, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, true, u0, v0, u1, v1, postShaderProgram_);
|
||||
DrawActiveTexture(colorTexture, x, y, w, h, (float)PSP_CoreParameter().pixelWidth, (float)PSP_CoreParameter().pixelHeight, true, u0, v0, u1, v1, postShaderProgram_, g_Config.iInternalScreenRotation);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user