[Bf-blender-cvs] [85b6e6da4a5] eevee-rewrite: EEVEE: Fix compiler errors in Windows
Antonio Vazquez
noreply at git.blender.org
Sun Sep 12 19:38:07 CEST 2021
Commit: 85b6e6da4a50a49597262ef0ba8e53a418d594b6
Author: Antonio Vazquez
Date: Sun Sep 12 19:37:59 2021 +0200
Branches: eevee-rewrite
https://developer.blender.org/rB85b6e6da4a50a49597262ef0ba8e53a418d594b6
EEVEE: Fix compiler errors in Windows
===================================================================
M source/blender/draw/engines/eevee/eevee_engine.h
M source/blender/draw/engines/eevee/eevee_shader.cc
M source/blender/gpu/intern/gpu_codegen.cc
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_engine.h b/source/blender/draw/engines/eevee/eevee_engine.h
index 40784e2980b..94d2e541b88 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.h
+++ b/source/blender/draw/engines/eevee/eevee_engine.h
@@ -22,4 +22,12 @@
#pragma once
-extern RenderEngineType DRW_engine_viewport_eevee_type;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ extern RenderEngineType DRW_engine_viewport_eevee_type;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/draw/engines/eevee/eevee_shader.cc b/source/blender/draw/engines/eevee/eevee_shader.cc
index baa47f5027c..4f080064f49 100644
--- a/source/blender/draw/engines/eevee/eevee_shader.cc
+++ b/source/blender/draw/engines/eevee/eevee_shader.cc
@@ -26,6 +26,7 @@
#include "eevee_shader.hh"
#include "eevee_material.hh"
+extern "C" {
extern char datatoc_common_attribute_lib_glsl[];
extern char datatoc_common_fullscreen_vert_glsl[];
extern char datatoc_common_gpencil_lib_glsl[];
@@ -125,6 +126,7 @@ extern char datatoc_eevee_volume_vert_glsl[];
extern char datatoc_eevee_shader_shared_hh[];
extern char datatoc_gpu_shader_codegen_lib_glsl[];
+}
namespace blender::eevee {
diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc
index de9315ba391..e41fcbf01eb 100644
--- a/source/blender/gpu/intern/gpu_codegen.cc
+++ b/source/blender/gpu/intern/gpu_codegen.cc
@@ -59,8 +59,9 @@
#include <sstream>
#include <string>
+extern "C" {
extern char datatoc_gpu_shader_codegen_lib_glsl[];
-
+}
/* -------------------------------------------------------------------- */
/** \name GPUPass Cache
*
More information about the Bf-blender-cvs
mailing list