preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-07 03:26:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3261 from raven02/patch-9

Browse Source 
Use GETexProjMapMode constants for GE_TEXMAP_TEXTURE_MATRIX
This commit is contained in:
Henrik Rydgård committed 2013-08-20 00:33:32 -07:00
2 parents 5576583bb2 77090143a0
commit 6bf448bcee
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/GLES/TransformPipeline.cpp
+4 -4
View File
@@ -683,13 +683,13 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
Vec3f source;
switch (gstate.getUVProjMode())
{
case 0: // Use model space XYZ as source
case GE_PROJMAP_POSITION: // Use model space XYZ as source
source = pos;
break;
case 1: // Use unscaled UV as source
case GE_PROJMAP_UV: // Use unscaled UV as source
source = Vec3f(ruv[0], ruv[1], 0.0f);
break;
case 2: // Use normalized normal as source
case GE_PROJMAP_NORMALIZED_NORMAL: // Use normalized normal as source
if (reader.hasNormal()) {
source = Vec3f(norm).Normalized();
} else {
@@ -697,7 +697,7 @@ void TransformDrawEngine::SoftwareTransformAndDraw(
source = Vec3f::AssignToAll(0.0f);
}
break;
case 3: // Use non-normalized normal as source!
case GE_PROJMAP_NORMAL: // Use non-normalized normal as source!
if (reader.hasNormal()) {
source = Vec3f(norm);
} else {
GPU/GLES/VertexShaderGenerator.cpp
+4 -4
View File
@@ -531,23 +531,23 @@ void GenerateVertexShader(int prim, char *buffer, bool useHWTransform) {
{
std::string temp_tc;
switch (gstate.getUVProjMode()) {
case 0: // Use model space XYZ as source
case GE_PROJMAP_POSITION: // Use model space XYZ as source
temp_tc = "vec4(a_position.xyz, 1.0)";
break;
case 1: // Use unscaled UV as source
case GE_PROJMAP_UV: // Use unscaled UV as source
{
static const char *rescaleuv[4] = {"", " * 1.9921875", " * 1.999969482421875", ""}; // 2*127.5f/128.f, 2*32767.5f/32768.f, 1.0f};
const char *factor = rescaleuv[(vertType & GE_VTYPE_TC_MASK) >> GE_VTYPE_TC_SHIFT];
temp_tc = StringFromFormat("vec4(a_texcoord.xy %s, 0.0, 1.0)", factor);
}
break;
case 2: // Use normalized transformed normal as source
case GE_PROJMAP_NORMALIZED_NORMAL: // Use normalized transformed normal as source
if (hasNormal)
temp_tc = "vec4(normalize(a_normal), 1.0)";
else
temp_tc = "vec4(0.0, 0.0, 1.0, 1.0)";
break;
case 3: // Use non-normalized transformed normal as source
case GE_PROJMAP_NORMAL: // Use non-normalized transformed normal as source
if (hasNormal)
temp_tc = "vec4(a_normal, 1.0)";
else