From 0d353c8bec9cc0c9f3dc6326177f3022c920f677 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 19 Oct 2012 17:13:14 +0200
Subject: Fix/Enhance NEWT ScreenMode (FS) integration, simplify NEWTWin
 creation

- Only list unique resolutions
- Use List<ScreenMode>
- Properly deactivateGLContext()/activateGLContext() for setMode(..)

Further:
- JoglES2Driver: Claim to have pointExt (FFP emul will follow up)
---
 src/jake2/render/JoglES2Renderer.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/jake2/render/JoglES2Renderer.java')

diff --git a/src/jake2/render/JoglES2Renderer.java b/src/jake2/render/JoglES2Renderer.java
index dec8a4a..a832ac1 100644
--- a/src/jake2/render/JoglES2Renderer.java
+++ b/src/jake2/render/JoglES2Renderer.java
@@ -71,7 +71,7 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
         // pre init, reads Cvar's
         if (!impl.R_Init(vid_xpos, vid_ypos)) return false;
         // activates the OpenGL context        
-        activate();
+        activateGLContext();
         
         // post init        
         return impl.R_Init2();
@@ -88,7 +88,7 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
      * @see jake2.client.refexport_t#BeginRegistration(java.lang.String)
      */
     public final void BeginRegistration(String map) {
-        activate();
+        activateGLContext();
         impl.R_BeginRegistration(map);
     }
 
@@ -96,7 +96,7 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
      * @see jake2.client.refexport_t#RegisterModel(java.lang.String)
      */
     public final model_t RegisterModel(String name) {
-        activate();
+        activateGLContext();
         return impl.R_RegisterModel(name);
     }
 
@@ -104,7 +104,7 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
      * @see jake2.client.refexport_t#RegisterSkin(java.lang.String)
      */
     public final image_t RegisterSkin(String name) {
-        activate();
+        activateGLContext();
         return impl.R_RegisterSkin(name);
     }
 
@@ -112,14 +112,14 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
      * @see jake2.client.refexport_t#RegisterPic(java.lang.String)
      */
     public final image_t RegisterPic(String name) {
-        activate();
+        activateGLContext();
         return impl.Draw_FindPic(name);
     }
     /** 
      * @see jake2.client.refexport_t#SetSky(java.lang.String, float, float[])
      */
     public final void SetSky(String name, float rotate, float[] axis) {
-        activate();
+        activateGLContext();
         impl.R_SetSky(name, rotate, axis);
     }
 
@@ -127,7 +127,7 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
      * @see jake2.client.refexport_t#EndRegistration()
      */
     public final void EndRegistration() {
-        activate();
+        activateGLContext();
         impl.R_EndRegistration();
     }
 
@@ -163,7 +163,7 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
      * @see jake2.client.refexport_t#DrawChar(int, int, int)
      */
     public final void DrawChar(int x, int y, int num) {
-        activate();
+        activateGLContext();
         impl.Draw_Char(x, y, num);
     }
 
@@ -224,7 +224,7 @@ final class JoglES2Renderer extends JoglES2Driver implements refexport_t, Ref {
     }
 
     public void screenshot() {
-        activate();
+        activateGLContext();
         impl.GL_ScreenShot_f();
     }
 
-- 
cgit v1.2.3