forked from bartvdbraak/blender
Fix a few warnings with Apple LLVM 7.0.2.
This commit is contained in:
parent
93c75bf992
commit
1a2b5d9a8b
@ -38,7 +38,7 @@ extern "C" {
|
||||
|
||||
typedef struct GPUFrameBuffer GPUFrameBuffer;
|
||||
typedef struct GPUOffScreen GPUOffScreen;
|
||||
typedef struct GPUTexture GPUTexture;
|
||||
struct GPUTexture;
|
||||
|
||||
/* GPU Framebuffer
|
||||
* - this is a wrapper for an OpenGL framebuffer object (FBO). in practice
|
||||
@ -47,13 +47,13 @@ typedef struct GPUTexture GPUTexture;
|
||||
* - after any of the GPU_framebuffer_* functions, GPU_framebuffer_restore must
|
||||
* be called before rendering to the window framebuffer again */
|
||||
|
||||
void GPU_texture_bind_as_framebuffer(GPUTexture *tex);
|
||||
void GPU_texture_bind_as_framebuffer(struct GPUTexture *tex);
|
||||
|
||||
GPUFrameBuffer *GPU_framebuffer_create(void);
|
||||
int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex, int slot, char err_out[256]);
|
||||
void GPU_framebuffer_texture_detach(GPUTexture *tex);
|
||||
int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, struct GPUTexture *tex, int slot, char err_out[256]);
|
||||
void GPU_framebuffer_texture_detach(struct GPUTexture *tex);
|
||||
void GPU_framebuffer_slots_bind(GPUFrameBuffer *fb, int slot);
|
||||
void GPU_framebuffer_texture_unbind(GPUFrameBuffer *fb, GPUTexture *tex);
|
||||
void GPU_framebuffer_texture_unbind(GPUFrameBuffer *fb, struct GPUTexture *tex);
|
||||
void GPU_framebuffer_free(GPUFrameBuffer *fb);
|
||||
bool GPU_framebuffer_check_valid(GPUFrameBuffer *fb, char err_out[256]);
|
||||
|
||||
@ -62,7 +62,7 @@ void GPU_framebuffer_bind_no_save(GPUFrameBuffer *fb, int slot);
|
||||
bool GPU_framebuffer_bound(GPUFrameBuffer *fb);
|
||||
|
||||
void GPU_framebuffer_restore(void);
|
||||
void GPU_framebuffer_blur(GPUFrameBuffer *fb, GPUTexture *tex, GPUFrameBuffer *blurfb, GPUTexture *blurtex);
|
||||
void GPU_framebuffer_blur(GPUFrameBuffer *fb, struct GPUTexture *tex, GPUFrameBuffer *blurfb, struct GPUTexture *blurtex);
|
||||
|
||||
/* GPU OffScreen
|
||||
* - wrapper around framebuffer and texture for simple offscreen drawing
|
||||
|
@ -38,7 +38,7 @@ extern "C" {
|
||||
|
||||
typedef struct GPUShader GPUShader;
|
||||
typedef struct GPUProgram GPUProgram;
|
||||
typedef struct GPUTexture GPUTexture;
|
||||
struct GPUTexture;
|
||||
|
||||
/* Builtin/Non-generated shaders */
|
||||
typedef enum GPUProgramType {
|
||||
@ -81,7 +81,7 @@ void GPU_shader_uniform_vector(GPUShader *shader, int location, int length,
|
||||
void GPU_shader_uniform_vector_int(GPUShader *shader, int location, int length,
|
||||
int arraysize, const int *value);
|
||||
|
||||
void GPU_shader_uniform_texture(GPUShader *shader, int location, GPUTexture *tex);
|
||||
void GPU_shader_uniform_texture(GPUShader *shader, int location, struct GPUTexture *tex);
|
||||
void GPU_shader_uniform_int(GPUShader *shader, int location, int value);
|
||||
void GPU_shader_geometry_stage_primitive_io(GPUShader *shader, int input, int output, int number);
|
||||
|
||||
|
@ -40,7 +40,7 @@ struct Image;
|
||||
struct ImageUser;
|
||||
struct PreviewImage;
|
||||
|
||||
typedef struct GPUFrameBuffer GPUFrameBuffer;
|
||||
struct GPUFrameBuffer;
|
||||
typedef struct GPUTexture GPUTexture;
|
||||
|
||||
/* GPU Texture
|
||||
@ -87,9 +87,9 @@ int GPU_texture_bound_number(GPUTexture *tex);
|
||||
|
||||
void GPU_texture_filter_mode(GPUTexture *tex, bool compare, bool use_filter);
|
||||
|
||||
GPUFrameBuffer *GPU_texture_framebuffer(GPUTexture *tex);
|
||||
struct GPUFrameBuffer *GPU_texture_framebuffer(GPUTexture *tex);
|
||||
int GPU_texture_framebuffer_attachment(GPUTexture *tex);
|
||||
void GPU_texture_framebuffer_set(GPUTexture *tex, GPUFrameBuffer *fb, int attachment);
|
||||
void GPU_texture_framebuffer_set(GPUTexture *tex, struct GPUFrameBuffer *fb, int attachment);
|
||||
|
||||
int GPU_texture_target(const GPUTexture *tex);
|
||||
int GPU_texture_width(const GPUTexture *tex);
|
||||
|
Loading…
Reference in New Issue
Block a user