From d55fa82fe6f236523dd4f701a15057b1a0ca8e36 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 14 Feb 2014 06:18:27 +0100 Subject: GLPixelStorageModes: Safe and restore GL2ES3 modes, i.e. add missing GLES3 modes. GLStateTracker: Use proper GL names for enums --- src/jogl/classes/jogamp/opengl/GLStateTracker.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/jogl/classes/jogamp') diff --git a/src/jogl/classes/jogamp/opengl/GLStateTracker.java b/src/jogl/classes/jogamp/opengl/GLStateTracker.java index 307fd0a15..0e451741c 100644 --- a/src/jogl/classes/jogamp/opengl/GLStateTracker.java +++ b/src/jogl/classes/jogamp/opengl/GLStateTracker.java @@ -177,20 +177,20 @@ public class GLStateTracker { pixelStateMap.put(GL.GL_PACK_ALIGNMENT, 4); pixelStateMap.put(GL2GL3.GL_PACK_SWAP_BYTES, GL.GL_FALSE); pixelStateMap.put(GL2GL3.GL_PACK_LSB_FIRST, GL.GL_FALSE); - pixelStateMap.put(GL2GL3.GL_PACK_ROW_LENGTH, 0); - pixelStateMap.put(GL2GL3.GL_PACK_SKIP_ROWS, 0); - pixelStateMap.put(GL2GL3.GL_PACK_SKIP_PIXELS, 0); + pixelStateMap.put(GL2ES3.GL_PACK_ROW_LENGTH, 0); + pixelStateMap.put(GL2ES3.GL_PACK_SKIP_ROWS, 0); + pixelStateMap.put(GL2ES3.GL_PACK_SKIP_PIXELS, 0); pixelStateMap.put(GL2GL3.GL_PACK_IMAGE_HEIGHT, 0); pixelStateMap.put(GL2GL3.GL_PACK_SKIP_IMAGES, 0); pixelStateMap.put(GL.GL_UNPACK_ALIGNMENT, 4); pixelStateMap.put(GL2GL3.GL_UNPACK_SWAP_BYTES, GL.GL_FALSE); pixelStateMap.put(GL2GL3.GL_UNPACK_LSB_FIRST, GL.GL_FALSE); - pixelStateMap.put(GL2GL3.GL_UNPACK_ROW_LENGTH, 0); - pixelStateMap.put(GL2GL3.GL_UNPACK_SKIP_ROWS, 0); - pixelStateMap.put(GL2GL3.GL_UNPACK_SKIP_PIXELS, 0); - pixelStateMap.put(GL2GL3.GL_UNPACK_IMAGE_HEIGHT, 0); - pixelStateMap.put(GL2GL3.GL_UNPACK_SKIP_IMAGES, 0); + pixelStateMap.put(GL2ES2.GL_UNPACK_ROW_LENGTH, 0); + pixelStateMap.put(GL2ES2.GL_UNPACK_SKIP_ROWS, 0); + pixelStateMap.put(GL2ES2.GL_UNPACK_SKIP_PIXELS, 0); + pixelStateMap.put(GL2ES3.GL_UNPACK_IMAGE_HEIGHT, 0); + pixelStateMap.put(GL2ES3.GL_UNPACK_SKIP_IMAGES, 0); } } -- cgit v1.2.3