Revision f2367b75
Added by Leszek Koltunski about 7 years ago
src/main/java/org/distorted/library/DistortedEffects.java | ||
---|---|---|
110 | 110 |
final InputStream mainVertStream = resources.openRawResource(R.raw.main_vertex_shader); |
111 | 111 |
final InputStream mainFragStream = resources.openRawResource(R.raw.main_fragment_shader); |
112 | 112 |
|
113 |
String mainVertHeader= ("#version 100\n");
|
|
114 |
String mainFragHeader= ("#version 100\n");
|
|
113 |
String mainVertHeader= Distorted.glslVersion;
|
|
114 |
String mainFragHeader= Distorted.glslVersion;
|
|
115 | 115 |
|
116 | 116 |
EffectNames name; |
117 | 117 |
EffectTypes type; |
... | ... | |
156 | 156 |
final InputStream blitVertStream = resources.openRawResource(R.raw.blit_vertex_shader); |
157 | 157 |
final InputStream blitFragStream = resources.openRawResource(R.raw.blit_fragment_shader); |
158 | 158 |
|
159 |
String blitVertHeader= ("#version 100\n#define NUM_VERTEX 0\n" );
|
|
160 |
String blitFragHeader= ("#version 100\n#define NUM_FRAGMENT 0\n");
|
|
159 |
String blitVertHeader= (Distorted.glslVersion + "#define NUM_VERTEX 0\n" );
|
|
160 |
String blitFragHeader= (Distorted.glslVersion + "#define NUM_FRAGMENT 0\n");
|
|
161 | 161 |
|
162 |
mBlitProgram = new DistortedProgram(blitVertStream,blitFragStream,blitVertHeader,blitFragHeader); |
|
162 |
try |
|
163 |
{ |
|
164 |
mBlitProgram = new DistortedProgram(blitVertStream,blitFragStream,blitVertHeader,blitFragHeader); |
|
165 |
} |
|
166 |
catch(Exception e) |
|
167 |
{ |
|
168 |
android.util.Log.e("EFFECTS", "exception trying to compile BLIT program: "+e.getMessage()); |
|
169 |
throw new RuntimeException(e.getMessage()); |
|
170 |
} |
|
163 | 171 |
|
164 | 172 |
int blitProgramH = mBlitProgram.getProgramHandle(); |
165 | 173 |
mBlitTextureH = GLES30.glGetUniformLocation( blitProgramH, "u_Texture"); |
... | ... | |
169 | 177 |
final InputStream debugVertexStream = resources.openRawResource(R.raw.test_vertex_shader); |
170 | 178 |
final InputStream debugFragmentStream = resources.openRawResource(R.raw.test_fragment_shader); |
171 | 179 |
|
172 |
mDebugProgram = new DistortedProgram(debugVertexStream,debugFragmentStream, "#version 100\n", "#version 100\n"); |
|
180 |
try |
|
181 |
{ |
|
182 |
mDebugProgram = new DistortedProgram(debugVertexStream,debugFragmentStream, Distorted.glslVersion, Distorted.glslVersion); |
|
183 |
} |
|
184 |
catch(Exception e) |
|
185 |
{ |
|
186 |
android.util.Log.e("EFFECTS", "exception trying to compile DEBUG program: "+e.getMessage()); |
|
187 |
throw new RuntimeException(e.getMessage()); |
|
188 |
} |
|
173 | 189 |
|
174 | 190 |
int debugProgramH = mDebugProgram.getProgramHandle(); |
175 | 191 |
mDebugObjDH = GLES30.glGetUniformLocation( debugProgramH, "u_objD"); |
Also available in: Unified diff
Upgrade from GLSL 1.00 to GLSL 3.00 ES
Introduce separate BLUR1 and BLUR2 shaders, the second one marging (writing to gl_FragDepth still does not work)