[Bf-blender-cvs] [db6db0b754a] temp-vulkan-shader: Remove warning (pragma once not implemented).

Jeroen Bakker noreply at git.blender.org
Fri Dec 2 12:04:59 CET 2022


Commit: db6db0b754adcbeef95bcb5431aafed6f8e694a5
Author: Jeroen Bakker
Date:   Fri Dec 2 11:12:16 2022 +0100
Branches: temp-vulkan-shader
https://developer.blender.org/rBdb6db0b754adcbeef95bcb5431aafed6f8e694a5

Remove warning (pragma once not implemented).

===================================================================

M	intern/ghost/intern/GHOST_ContextVK.cpp
M	source/blender/draw/engines/eevee_next/eevee_defines.hh
M	source/blender/gpu/intern/gpu_shader_create_info.cc

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextVK.cpp b/intern/ghost/intern/GHOST_ContextVK.cpp
index e446d9057a7..ff41741f162 100644
--- a/intern/ghost/intern/GHOST_ContextVK.cpp
+++ b/intern/ghost/intern/GHOST_ContextVK.cpp
@@ -26,7 +26,7 @@
 
 /* Set to 0 to allow devices that do not have the required features.
  * This allows development on OSX until we really needs these features. */
-#define STRICT_REQUIREMENTS 1
+#define STRICT_REQUIREMENTS 0
 
 using namespace std;
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_defines.hh b/source/blender/draw/engines/eevee_next/eevee_defines.hh
index fca8737f661..2c08aabbcfe 100644
--- a/source/blender/draw/engines/eevee_next/eevee_defines.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_defines.hh
@@ -9,7 +9,9 @@
  * dragging larger headers into the createInfo pipeline which would cause problems.
  */
 
-#pragma once
+#ifndef GPU_VULKAN
+#  pragma once
+#endif
 
 /* Hierarchical Z down-sampling. */
 #define HIZ_MIP_COUNT 8
diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc
index ffbeedad285..6f4c728bbb0 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.cc
+++ b/source/blender/gpu/intern/gpu_shader_create_info.cc
@@ -387,6 +387,7 @@ bool gpu_shader_create_info_compile_all()
           reinterpret_cast<const GPUShaderCreateInfo *>(info));
       if (shader == nullptr) {
         printf("Compilation %s Failed\n", info->name_.c_str());
+        // return false;
       }
       else {
         success++;



More information about the Bf-blender-cvs mailing list