diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-03 18:01:32 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-03 18:01:32 +0300 |
commit | 520ced4ad504bfcbcf0e86ff07651736dc51b8f0 (patch) | |
tree | 94cac91b50c15cdb3df35704168cd194fdb5b299 /source/blender/gpu/intern/gpu_framebuffer.c | |
parent | b1b5ded37f9e2967fb1e2b33c6aef89c233750ed (diff) |
Modifications to GPU_texture:
-Remove NPOT check as it should be supported by default with OGL 3.3
-All custom texture creation follow the same path now
-Now explicit texture format is required when creating a custom texture (Non RGBA8)
-Support for arrays of textures
Reviewers: dfelinto, merwin
Differential Revision: https://developer.blender.org/D2452
Diffstat (limited to 'source/blender/gpu/intern/gpu_framebuffer.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_framebuffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index ec1471744fa..2ef8018e5e9 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -54,7 +54,7 @@ struct GPUFrameBuffer { static void GPU_print_framebuffer_error(GLenum status, char err_out[256]) { - const char *format = "GPUFrameBuffer: framebuffer status %s"; + const char *format = "GPUFrameBuffer: framebuffer status %s\n"; const char *err = "unknown"; #define format_status(X) \ @@ -453,7 +453,7 @@ GPUOffScreen *GPU_offscreen_create(int width, int height, int samples, char err_ return NULL; } - ofs->color = GPU_texture_create_2D_multisample(width, height, NULL, GPU_HDR_NONE, samples, err_out); + ofs->color = GPU_texture_create_2D_multisample(width, height, NULL, samples, err_out); if (!ofs->color) { GPU_offscreen_free(ofs); return NULL; |