diff --git a/deps/vera b/deps/vera index 0ef89464..2a7eae97 160000 --- a/deps/vera +++ b/deps/vera @@ -1 +1 @@ -Subproject commit 0ef894644eaa73c2004305bcf9b5324a8520c157 +Subproject commit 2a7eae97a6a6c48350b4f449746088dc92d4a20b diff --git a/scripts/gv_preferences.py b/scripts/gv_preferences.py index b545bc33..320207e3 100644 --- a/scripts/gv_preferences.py +++ b/scripts/gv_preferences.py @@ -34,8 +34,8 @@ def fetch_pref(name: str): #ifdef MODEL_VERTEX_TEXCOORD attribute vec2 a_texcoord; -varying vec2 v_texcoord; #endif +varying vec2 v_texcoord; #ifdef MODEL_VERTEX_TANGENT attribute vec4 a_tangent; @@ -49,8 +49,8 @@ def fetch_pref(name: str): #endif void main(void) { - v_position = u_modelMatrix * a_position; + v_texcoord = v_position.xy; #ifdef MODEL_VERTEX_COLOR v_color = a_color; diff --git a/src/main.cpp b/src/main.cpp index 420d0f38..f9dc51f2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -363,7 +363,7 @@ int main(int argc, char **argv) { if (window_properties.style != vera::HEADLESS) { vera::setWindowTitle("GlslViewer"); - #if defined(DRIVER_GLFW) + #if defined(DRIVER_GLFW) && defined(PLATFORM_LINUX) int icon_width, icon_height; unsigned char* icon_data = vera::loadPixelsBase64(icon_base64, &icon_width, &icon_height); vera::setWindowIcon(icon_data, icon_width, icon_height);