A couple missed lines on the rebase.

This commit is contained in:
Ryan Houdek 2012-10-13 12:43:00 -05:00
parent 1a8005d948
commit 3f0d7312fa
2 changed files with 4 additions and 5 deletions

View File

@ -978,16 +978,15 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
// Colors will be blended against the alpha from ocol1...
WRITE(p, " ocol1 = ocol0;\n");
// ...and the alpha from ocol0 will be written to the framebuffer.
WRITE(p, " ocol0.a = " I_ALPHA"[0].a;\n");
if (ApiType == API_GLSL)
WRITE(p, " ocol0.a = " I_ALPHA"[0].a;\n");
}
if (ApiType == API_GLSL)
{
if (DepthTextureEnable)
WRITE(p, "gl_FragDepth = depth;\n");
if (dstAlphaMode != DSTALPHA_DUAL_SOURCE_BLEND)
WRITE(p, "gl_FragData[0] = ocol0;\n");
}
}
WRITE(p, "}\n");
if (text[sizeof(text) - 1] != 0x7C)

View File

@ -596,7 +596,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
//seems to get rather complicated
}
if (api_type & API_D3D9)
if (ApiType & API_D3D9)
{
// D3D9 is addressing pixel centers instead of pixel boundaries in clip space.
// Thus we need to offset the final position by half a pixel