fclem/blender
2
1
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

GPU: Shader Create Info GLSL-C++ stubs #3

Closed
Clément Foucault wants to merge 90 commits from create-info-cpp-macros into glsl-include
pull from: create-info-cpp-macros
merge into: fclem:glsl-include

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 90 Files Changed 158 +7 -1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 152852e877 - Show all commits

8
source/blender/gpu/GPU_shader_shared_utils.hh
View File

@ -29,7 +29,13 @@
*/ */
#ifdef GLSL_CPP_STUBS #ifdef GLSL_CPP_STUBS
/* Do nothing. */ # pragma once
using bool32_t = bool;
/** Packed types are needed for MSL which have different alignment rules for float3. */
using packed_float3 = float3;
using packed_int3 = int3;
using packed_uint3 = uint3;
#elif defined(GPU_SHADER) #elif defined(GPU_SHADER)
/* Silence macros when compiling for shaders. */ /* Silence macros when compiling for shaders. */
# define BLI_STATIC_ASSERT(cond, msg) # define BLI_STATIC_ASSERT(cond, msg)