Merge pull request #4922 from processing/revert-4915-arm-opengl

Revert "ARM: Allow Raspberry Pi's Mesa GL driver to use up to 8 lights"
This commit is contained in:
Ben Fry
2017-02-23 17:12:24 -05:00
committed by GitHub
@@ -6885,7 +6885,8 @@ public class PGraphicsOpenGL extends PGraphics {
// overwrite the default shaders with vendor specific versions
// if needed
if (OPENGL_RENDERER.equals("VideoCore IV HW")) { // Mesa driver for same hardware
if (OPENGL_RENDERER.equals("VideoCore IV HW") || // Broadcom's binary driver for Raspberry Pi
OPENGL_RENDERER.equals("Gallium 0.4 on VC4")) { // Mesa driver for same hardware
defLightShaderVertURL =
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert-vc4.glsl");
defTexlightShaderVertURL =