eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 19:05:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

better detection of number of samples

Browse Source
This commit is contained in:
codeanticode
2013-06-02 15:03:06 -04:00
parent f8fbb8b6ba
commit d5085d3254
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/processing/opengl/PGL.java
View File

@@ -698,7 +698,7 @@ public class PGL {
protected boolean isMultisampled() {
return 1 < numSamples || 0 < capabilities.getNumSamples();
return 1 < numSamples;
}
@@ -850,7 +850,7 @@ public class PGL {
protected void syncBackTexture() {
if (usingFrontTex) needSepFrontTex = true;
if (USE_JOGL_FBOLAYER) {
if (0 < capabilities.getNumSamples()) {
if (1 < numSamples) {
backFBO.syncSamplingSink(gl);
backFBO.bind(gl);
}
@@ -887,10 +887,9 @@ public class PGL {
fboHeight = nextPowerOfTwo(pg.height);
}
getIntegerv(MAX_SAMPLES, intBuffer);
if (-1 < ext.indexOf("_framebuffer_multisample") &&
1 < intBuffer.get(0)) {
numSamples = reqNumSamples;
int maxs = maxSamples();
if (-1 < ext.indexOf("_framebuffer_multisample") && 1 < maxs) {
numSamples = PApplet.min(reqNumSamples, maxs);
} else {
numSamples = 1;
}
@@ -1126,7 +1125,7 @@ public class PGL {
fcount = 0;
lastm = m;
}
if (currentFps < 0.5f * targetFps) {
if (currentFps < 0.25f * targetFps) {
finish();
}
}
@@ -2181,6 +2180,12 @@ public class PGL {
}
protected int maxSamples() {
getIntegerv(MAX_SAMPLES, intBuffer);
return intBuffer.get(0);
}
protected int getMaxTexUnits() {
getIntegerv(MAX_TEXTURE_IMAGE_UNITS, intBuffer);
return intBuffer.get(0);
@@ -2580,7 +2585,7 @@ public class PGL {
}
if (fboDrawable != null) {
backFBO = fboDrawable.getFBObject(GL.GL_BACK);
if (0 < capabilities.getNumSamples()) {
if (1 < numSamples) {
if (needSepFrontTex) {
// When using multisampled FBO, the back buffer is the MSAA
// surface so it cannot be read from. The sink buffer contains
@@ -2651,6 +2656,10 @@ public class PGL {
if (!hasShaders()) {
throw new RuntimeException(MISSING_GLSL_ERROR);
}
if (USE_JOGL_FBOLAYER && capabilities.isFBO()) {
int maxs = maxSamples();
numSamples = PApplet.min(capabilities.getNumSamples(), maxs);
}
}
@Override