From ade8d84fe3f744e751e14904df7183343aa4c0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sun, 30 Aug 2020 19:07:49 +0200 Subject: GPUFrameBuffer: Fix build error on MSVC This also gets rid of the macro. --- source/blender/gpu/GPU_framebuffer.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'source/blender/gpu/GPU_framebuffer.h') diff --git a/source/blender/gpu/GPU_framebuffer.h b/source/blender/gpu/GPU_framebuffer.h index a52cdea5167..e6648c69de7 100644 --- a/source/blender/gpu/GPU_framebuffer.h +++ b/source/blender/gpu/GPU_framebuffer.h @@ -150,15 +150,11 @@ void GPU_framebuffer_config_array(GPUFrameBuffer *fb, const GPUAttachment *confi _tex, _face, _mip, \ } -#define GPU_framebuffer_texture_attach(_fb, _texture, _slot, _mip) \ - GPU_framebuffer_texture_attach_ex( \ - _fb, (GPUAttachment)GPU_ATTACHMENT_TEXTURE_MIP(_texture, _mip), _slot) -#define GPU_framebuffer_texture_layer_attach(_fb, _texture, _slot, layer, _mip) \ - GPU_framebuffer_texture_attach_ex( \ - _fb, (GPUAttachment)GPU_ATTACHMENT_TEXTURE_LAYER_MIP(_texture, layer, _mip), _slot) -#define GPU_framebuffer_texture_cubeface_attach(_fb, _texture, _slot, face, _mip) \ - GPU_framebuffer_texture_attach_ex( \ - _fb, (GPUAttachment)GPU_ATTACHMENT_TEXTURE_CUBEFACE_MIP(_texture, face, _mip), _slot) +void GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex, int slot, int mip); +void GPU_framebuffer_texture_layer_attach( + GPUFrameBuffer *fb, GPUTexture *tex, int slot, int layer, int mip); +void GPU_framebuffer_texture_cubeface_attach( + GPUFrameBuffer *fb, GPUTexture *tex, int slot, int face, int mip); /* Framebuffer operations */ -- cgit v1.2.3