Browse Source

Merge pull request #19013 from bruvzg/uwp_build_fix

Fix UWP build after #14622.
Rémi Verschelde 7 years ago
parent
commit
30caac8ee3
2 changed files with 4 additions and 4 deletions
  1. 2 2
      drivers/gles2/rasterizer_gles2.cpp
  2. 2 2
      drivers/gles3/rasterizer_gles3.cpp

+ 2 - 2
drivers/gles2/rasterizer_gles2.cpp

@@ -346,7 +346,7 @@ void RasterizerGLES2::set_boot_image(const Ref<Image> &p_image, const Color &p_c
 
 	if (OS::get_singleton()->is_layered_allowed()) {
 		if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) {
-#ifdef WINDOWS_ENABLED
+#if (defined WINDOWS_ENABLED) && !(defined UWP_ENABLED)
 			Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
 			uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
 			if (data) {
@@ -401,7 +401,7 @@ void RasterizerGLES2::end_frame(bool p_swap_buffers) {
 
 	if (OS::get_singleton()->is_layered_allowed()) {
 		if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) {
-#ifdef WINDOWS_ENABLED
+#if (defined WINDOWS_ENABLED) && !(defined UWP_ENABLED)
 			Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
 			uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
 			if (data) {

+ 2 - 2
drivers/gles3/rasterizer_gles3.cpp

@@ -335,7 +335,7 @@ void RasterizerGLES3::set_boot_image(const Ref<Image> &p_image, const Color &p_c
 
 	if (OS::get_singleton()->is_layered_allowed()) {
 		if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) {
-#ifdef WINDOWS_ENABLED
+#if (defined WINDOWS_ENABLED) && !(defined UWP_ENABLED)
 			Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
 			uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
 			if (data) {
@@ -392,7 +392,7 @@ void RasterizerGLES3::end_frame(bool p_swap_buffers) {
 
 	if (OS::get_singleton()->is_layered_allowed()) {
 		if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) {
-#ifdef WINDOWS_ENABLED
+#if (defined WINDOWS_ENABLED) && !(defined UWP_ENABLED)
 			Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
 			uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
 			if (data) {