Revision bfe45b4a
Added by Leszek Koltunski about 5 years ago
src/main/java/org/distorted/library/main/DistortedOutputSurface.java | ||
---|---|---|
263 | 263 |
GLES31.glDisable(GLES31.GL_STENCIL_TEST); |
264 | 264 |
GLES31.glStencilMask(0x00); |
265 | 265 |
|
266 |
DistortedEffects.blitDepthPriv(this, buffer.getWidthCorrection(), buffer.getHeightCorrection() );
|
|
266 |
Distorted.blitDepthPriv(this, buffer.getWidthCorrection(), buffer.getHeightCorrection() ); |
|
267 | 267 |
GLES31.glActiveTexture(GLES31.GL_TEXTURE0); |
268 | 268 |
GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, 0); |
269 | 269 |
GLES31.glActiveTexture(GLES31.GL_TEXTURE1); |
... | ... | |
290 | 290 |
|
291 | 291 |
private static void oitClear(DistortedOutputSurface buffer) |
292 | 292 |
{ |
293 |
int counter = DistortedEffects.zeroOutAtomic();
|
|
294 |
DistortedEffects.oitClear(buffer,counter);
|
|
293 |
int counter = Distorted.zeroOutAtomic(); |
|
294 |
Distorted.oitClear(buffer,counter); |
|
295 | 295 |
GLES31.glMemoryBarrier(GLES31.GL_SHADER_STORAGE_BARRIER_BIT|GLES31.GL_ATOMIC_COUNTER_BARRIER_BIT); |
296 | 296 |
} |
297 | 297 |
|
... | ... | |
309 | 309 |
DistortedRenderState.colorDepthStencilOn(); |
310 | 310 |
DistortedRenderState.enableDepthTest(); |
311 | 311 |
|
312 |
DistortedEffects.oitBuild(this, buffer.getWidthCorrection(), buffer.getHeightCorrection() );
|
|
312 |
Distorted.oitBuild(this, buffer.getWidthCorrection(), buffer.getHeightCorrection() ); |
|
313 | 313 |
GLES31.glActiveTexture(GLES31.GL_TEXTURE0); |
314 | 314 |
GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, 0); |
315 | 315 |
GLES31.glActiveTexture(GLES31.GL_TEXTURE1); |
... | ... | |
338 | 338 |
GLES31.glActiveTexture(GLES31.GL_TEXTURE1); |
339 | 339 |
GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, mDepthStencilH[fbo]); |
340 | 340 |
DistortedRenderState.switchOffColorDepthStencil(); |
341 |
DistortedEffects.oitCollapse(this, corrW, corrH);
|
|
341 |
Distorted.oitCollapse(this, corrW, corrH); |
|
342 | 342 |
GLES31.glBindTexture(GLES31.GL_TEXTURE_2D, 0); |
343 | 343 |
} |
344 | 344 |
|
345 | 345 |
setAsOutput(currTime); |
346 | 346 |
DistortedRenderState.switchColorDepthOnStencilOff(); |
347 |
DistortedEffects.oitRender(this, corrW, corrH);
|
|
347 |
Distorted.oitRender(this, corrW, corrH); |
|
348 | 348 |
DistortedRenderState.restoreColorDepthStencil(); |
349 | 349 |
|
350 | 350 |
return 1; |
... | ... | |
866 | 866 |
mRenderWayOIT = oit; |
867 | 867 |
|
868 | 868 |
if( initialSize>0.0f && initialSize<10.0f ) |
869 |
DistortedEffects.setSSBOSize(initialSize);
|
|
869 |
Distorted.setSSBOSize(initialSize); |
|
870 | 870 |
} |
871 | 871 |
|
872 | 872 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Move all Program-related stuff to Distorted. Now the DistortedEffects class is very simple.