mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19013 from bruvzg/uwp_build_fix

Browse Source 
Fix UWP build after #14622.
This commit is contained in:
Rémi Verschelde 2018-05-18 20:55:47 +02:00 committed by GitHub
commit 30caac8ee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gles2/rasterizer_gles2.cpp
View File

@ -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()->is_layered_allowed()) {
if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) { 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(); Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
uint8_t *data = OS::get_singleton()->get_layered_buffer_data(); uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
if (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()->is_layered_allowed()) {
if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) { 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(); Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
uint8_t *data = OS::get_singleton()->get_layered_buffer_data(); uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
if (data) { if (data) {

4
drivers/gles3/rasterizer_gles3.cpp
View File

@ -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()->is_layered_allowed()) {
if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) { 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(); Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
uint8_t *data = OS::get_singleton()->get_layered_buffer_data(); uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
if (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()->is_layered_allowed()) {
if (OS::get_singleton()->get_window_per_pixel_transparency_enabled()) { 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(); Size2 wndsize = OS::get_singleton()->get_layered_buffer_size();
uint8_t *data = OS::get_singleton()->get_layered_buffer_data(); uint8_t *data = OS::get_singleton()->get_layered_buffer_data();
if (data) { if (data) {