From 2b1aaf061d49b684a3bf575bc10d6a84add820c1 Mon Sep 17 00:00:00 2001
From: Stefanos Kornilios Mitsis Poiitidis <skmp@nillware.com>
Date: Wed, 22 Oct 2014 14:39:07 +0200
Subject: [PATCH] Isolate GLES, add DESKTOPGL option to core.mk

---
 core/core.mk              | 4 ++++
 core/rend/gles/gldraw.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/core/core.mk b/core/core.mk
index 7bce842eb..32d48c38b 100755
--- a/core/core.mk
+++ b/core/core.mk
@@ -81,4 +81,8 @@ ifdef NO_REC
   RZDCY_CFLAGS += -DHOST_NO_REC
 endif
 
+ifndef DESKTOPGL
+  RZDCY_CFLAGS += -DGLES
+endif
+
 RZDCY_CXXFLAGS := $(RZDCY_CFLAGS) -fno-exceptions -fno-rtti -std=gnu++11
\ No newline at end of file
diff --git a/core/rend/gles/gldraw.cpp b/core/rend/gles/gldraw.cpp
index 2dc2b0497..51d616b52 100644
--- a/core/rend/gles/gldraw.cpp
+++ b/core/rend/gles/gldraw.cpp
@@ -907,7 +907,9 @@ void SetMVS_Mode(u32 mv_mode,ISP_Modvol ispc)
 
 void SetupMainVBO()
 {
+#ifndef GLES
 	glBindVertexArray(gl.vbo.vao);
+#endif
 
 	glBindBuffer(GL_ARRAY_BUFFER, gl.vbo.geometry); glCheck();
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, gl.vbo.idxs); glCheck();
@@ -928,7 +930,9 @@ void SetupMainVBO()
 
 void SetupModvolVBO()
 {
+#ifndef GLES
 	glBindVertexArray(gl.vbo.vao);
+#endif
 
 	glBindBuffer(GL_ARRAY_BUFFER, gl.vbo.modvols); glCheck();