Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Have the shader generators generate modern GLSL if available.

Browse Source 
This opens up to use other modern features like dual source alpha later.
This commit is contained in:
Henrik Rydgard 2013-12-07 12:53:52 +01:00
parent 24885ad28d
commit 3cde4921ae
2 changed files with 73 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
GPU/GLES/FragmentShaderGenerator.cpp
View File

@ -15,11 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#if defined(USING_GLES2)
#define GLSL_ES_1_0
#else
#define GLSL_1_3
#if !defined(USING_GLES2)
// SDL 1.2 on Apple does not have support for OpenGL 3 and hence needs
// special treatment in the shader generator.
#if defined(__APPLE__)
@ -295,27 +291,47 @@ void ComputeFragmentShaderID(FragmentShaderID *id) {
void GenerateFragmentShader(char *buffer) {
char *p = buffer;
// In GLSL ES 3.0, you use "in" variables instead of varying.
bool glslES30 = false;
const char *varying = "varying";
bool highpFog = false;
#if defined(GLSL_ES_1_0)
WRITE(p, "#version 100\n"); // GLSL ES 1.0
#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"); // GLSL ES 1.0
glslES30 = true;
} else {
WRITE(p, "#version 100\n"); // GLSL ES 1.0
}
WRITE(p, "precision lowp float;\n");
// PowerVR needs highp to do the fog in MHU correctly.
// Others don't, and some can't handle highp in the fragment shader.
highpFog = gl_extensions.gpuVendor == GPU_VENDOR_POWERVR;
#elif !defined(FORCE_OPENGL_2_0)
WRITE(p, "#version 110\n");
// Remove lowp/mediump in non-mobile implementations
WRITE(p, "#define lowp\n");
WRITE(p, "#define mediump\n");
WRITE(p, "#define highp\n");
if (gl_extensions.VersionGEThan(3, 3, 0)) {
glslES30 = true;
WRITE(p, "#version 330\n");
} else {
WRITE(p, "#version 110\n");
// Remove lowp/mediump in non-mobile non-glsl 3 implementations
WRITE(p, "#define lowp\n");
WRITE(p, "#define mediump\n");
WRITE(p, "#define highp\n");
}
#else
// Remove lowp/mediump in non-mobile implementations
// Need to remove lowp/mediump for Mac
WRITE(p, "#define lowp\n");
WRITE(p, "#define mediump\n");
WRITE(p, "#define highp\n");
#endif
if (glslES30) {
varying = "in";
}
bool lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled();
bool doTexture = gstate.isTextureMapEnabled() && !gstate.isModeClear();
bool enableFog = gstate.isFogEnabled() && !gstate.isModeThrough() && !gstate.isModeClear();
@ -343,19 +359,19 @@ void GenerateFragmentShader(char *buffer) {
if (gstate.isTextureMapEnabled() && gstate.getTextureFunction() == GE_TEXFUNC_BLEND)
WRITE(p, "uniform lowp vec3 u_texenv;\n");
WRITE(p, "varying lowp vec4 v_color0;\n");
WRITE(p, "%s lowp vec4 v_color0;\n", varying);
if (lmode)
WRITE(p, "varying lowp vec3 v_color1;\n");
WRITE(p, "%s lowp vec3 v_color1;\n", varying);
if (enableFog) {
WRITE(p, "uniform lowp vec3 u_fogcolor;\n");
WRITE(p, "varying %s float v_fogdepth;\n", highpFog ? "highp" : "mediump");
WRITE(p, "%s %s float v_fogdepth;\n", varying, highpFog ? "highp" : "mediump");
}
if (doTexture)
{
if (doTextureProjection)
WRITE(p, "varying mediump vec3 v_texcoord;\n");
WRITE(p, "%s mediump vec3 v_texcoord;\n", varying);
else
WRITE(p, "varying mediump vec2 v_texcoord;\n");
WRITE(p, "%s mediump vec2 v_texcoord;\n", varying);
}
if (enableAlphaTest) {

52
GPU/GLES/VertexShaderGenerator.cpp
View File

@ -139,16 +139,36 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
// #define USE_FOR_LOOP
// In GLSL ES 3.0, you use "out" variables instead.
bool glslES30 = false;
const char *varying = "varying";
bool highpFog = false;
#if defined(USING_GLES2)
WRITE(p, "#version 100\n"); // GLSL ES 1.0
// 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");
glslES30 = true;
} else {
WRITE(p, "#version 100\n"); // GLSL ES 1.0
}
WRITE(p, "precision highp float;\n");
// PowerVR needs highp to do the fog in MHU correctly.
// Others don't, and some can't handle highp in the fragment shader.
highpFog = gl_extensions.gpuVendor == GPU_VENDOR_POWERVR;
#elif !defined(FORCE_OPENGL_2_0)
WRITE(p, "#version 110\n");
// Remove lowp/mediump in non-mobile implementations
WRITE(p, "#define lowp\n");
WRITE(p, "#define mediump\n");
WRITE(p, "#define highp\n");
if (gl_extensions.VersionGEThan(3, 3, 0)) {
glslES30 = true;
WRITE(p, "#version 330\n");
} else {
WRITE(p, "#version 110\n");
// Remove lowp/mediump in non-mobile non-glsl 3 implementations
WRITE(p, "#define lowp\n");
WRITE(p, "#define mediump\n");
WRITE(p, "#define highp\n");
}
#else
// Need to remove lowp/mediump for Mac
WRITE(p, "#define lowp\n");
@ -156,6 +176,10 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
WRITE(p, "#define highp\n");
#endif
if (glslES30) {
varying = "out";
}
int lmode = gstate.isUsingSecondaryColor() && gstate.isLightingEnabled();
int doTexture = gstate.isTextureMapEnabled() && !gstate.isModeClear();
bool doTextureProjection = gstate.getUVGenMode() == GE_TEXMAP_TEXTURE_MATRIX;
@ -272,22 +296,24 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
WRITE(p, "uniform highp vec2 u_fogcoef;\n");
}
WRITE(p, "varying lowp vec4 v_color0;\n");
if (lmode) WRITE(p, "varying lowp vec3 v_color1;\n");
WRITE(p, "%s lowp vec4 v_color0;\n", varying);
if (lmode) {
WRITE(p, "%s lowp vec3 v_color1;\n", varying);
}
if (doTexture) {
if (doTextureProjection)
WRITE(p, "varying mediump vec3 v_texcoord;\n");
WRITE(p, "%s mediump vec3 v_texcoord;\n", varying);
else
WRITE(p, "varying mediump vec2 v_texcoord;\n");
WRITE(p, "%s mediump vec2 v_texcoord;\n", varying);
}
if (enableFog) {
// See the fragment shader generator
if (gl_extensions.gpuVendor == GPU_VENDOR_POWERVR) {
WRITE(p, "varying highp float v_fogdepth;\n");
if (highpFog) {
WRITE(p, "%s highp float v_fogdepth;\n", varying);
} else {
WRITE(p, "varying mediump float v_fogdepth;\n");
WRITE(p, "%s mediump float v_fogdepth;\n", varying);
}
}