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

Some shader fixes

Browse source
This commit is contained in:
Henrik Rydgard 2013-12-17 23:38:58 +01:00
parent 2c57a0a897
commit 832c933cb8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
GPU/GLES/FragmentShaderGenerator.cpp
View file

@ -307,13 +307,16 @@ void GenerateFragmentShader(char *buffer) {
bool glslES30 = false;
const char *varying = "varying";
const char *fragColor0 = "gl_FragColor";
const char *texture = "texture2D";
bool highpFog = false;
#if defined(USING_GLES2)
// Let's wait until we have a real use for this.
// ES doesn't support dual source alpha :(
if (false && gl_extensions.GLES3) {
if (gl_extensions.GLES3) {
WRITE(p, "#version 300 es\n"); // GLSL ES 1.0
fragColor0 = "fragColor0";
texture = "texture";
glslES30 = true;
} else {
WRITE(p, "#version 100\n"); // GLSL ES 1.0
@ -326,6 +329,7 @@ void GenerateFragmentShader(char *buffer) {
#elif !defined(FORCE_OPENGL_2_0)
if (gl_extensions.VersionGEThan(3, 3, 0)) {
fragColor0 = "fragColor0";
texture = "texture";
glslES30 = true;
WRITE(p, "#version 330\n");
} else if (gl_extensions.VersionGEThan(3, 0, 0)) {
@ -437,9 +441,9 @@ void GenerateFragmentShader(char *buffer) {
if (gstate.isTextureMapEnabled()) {
if (doTextureProjection) {
WRITE(p, " vec4 t = texture2DProj(tex, v_texcoord);\n");
WRITE(p, " vec4 t = %sProj(tex, v_texcoord);\n", texture);
} else {
WRITE(p, " vec4 t = texture2D(tex, v_texcoord);\n");
WRITE(p, " vec4 t = %s(tex, v_texcoord);\n", texture);
}
WRITE(p, " vec4 p = v_color0;\n");

4
GPU/GLES/VertexShaderGenerator.cpp
View file

@ -148,8 +148,8 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
#if defined(USING_GLES2)
// Let's wait until we have a real use for this.
// ES doesn't support dual source alpha :(
if (false && gl_extensions.GLES3) {
WRITE(p, "version 300 es\n");
if (gl_extensions.GLES3) {
WRITE(p, "#version 300 es\n");
glslES30 = true;
} else {
WRITE(p, "#version 100\n"); // GLSL ES 1.0