Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/draw/intern/draw_manager_texture.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/draw/intern/draw_manager_texture.c')
-rw-r--r--source/blender/draw/intern/draw_manager_texture.c167
1 files changed, 90 insertions, 77 deletions
diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c
index 92fca2d4f04..4750a35d784 100644
--- a/source/blender/draw/intern/draw_manager_texture.c
+++ b/source/blender/draw/intern/draw_manager_texture.c
@@ -26,126 +26,139 @@
/* Maybe gpu_texture.c is a better place for this. */
static bool drw_texture_format_supports_framebuffer(eGPUTextureFormat format)
{
- /* Some formats do not work with framebuffers. */
- switch (format) {
- /* Only add formats that are COMPATIBLE with FB.
- * Generally they are multiple of 16bit. */
- case GPU_R8:
- case GPU_R8UI:
- case GPU_R16F:
- case GPU_R16I:
- case GPU_R16UI:
- case GPU_R16:
- case GPU_R32F:
- case GPU_R32UI:
- case GPU_RG8:
- case GPU_RG16:
- case GPU_RG16F:
- case GPU_RG16I:
- case GPU_RG32F:
- case GPU_R11F_G11F_B10F:
- case GPU_RGBA8:
- case GPU_RGBA16F:
- case GPU_RGBA32F:
- case GPU_DEPTH_COMPONENT16:
- case GPU_DEPTH_COMPONENT24:
- case GPU_DEPTH24_STENCIL8:
- case GPU_DEPTH_COMPONENT32F:
- return true;
- default:
- return false;
- }
+ /* Some formats do not work with framebuffers. */
+ switch (format) {
+ /* Only add formats that are COMPATIBLE with FB.
+ * Generally they are multiple of 16bit. */
+ case GPU_R8:
+ case GPU_R8UI:
+ case GPU_R16F:
+ case GPU_R16I:
+ case GPU_R16UI:
+ case GPU_R16:
+ case GPU_R32F:
+ case GPU_R32UI:
+ case GPU_RG8:
+ case GPU_RG16:
+ case GPU_RG16F:
+ case GPU_RG16I:
+ case GPU_RG32F:
+ case GPU_R11F_G11F_B10F:
+ case GPU_RGBA8:
+ case GPU_RGBA16F:
+ case GPU_RGBA32F:
+ case GPU_DEPTH_COMPONENT16:
+ case GPU_DEPTH_COMPONENT24:
+ case GPU_DEPTH24_STENCIL8:
+ case GPU_DEPTH_COMPONENT32F:
+ return true;
+ default:
+ return false;
+ }
}
#endif
void drw_texture_set_parameters(GPUTexture *tex, DRWTextureFlag flags)
{
- GPU_texture_bind(tex, 0);
- if (flags & DRW_TEX_MIPMAP) {
- GPU_texture_mipmap_mode(tex, true, flags & DRW_TEX_FILTER);
- GPU_texture_generate_mipmap(tex);
- }
- else {
- GPU_texture_filter_mode(tex, flags & DRW_TEX_FILTER);
- }
- GPU_texture_wrap_mode(tex, flags & DRW_TEX_WRAP);
- GPU_texture_compare_mode(tex, flags & DRW_TEX_COMPARE);
- GPU_texture_unbind(tex);
+ GPU_texture_bind(tex, 0);
+ if (flags & DRW_TEX_MIPMAP) {
+ GPU_texture_mipmap_mode(tex, true, flags & DRW_TEX_FILTER);
+ GPU_texture_generate_mipmap(tex);
+ }
+ else {
+ GPU_texture_filter_mode(tex, flags & DRW_TEX_FILTER);
+ }
+ GPU_texture_wrap_mode(tex, flags & DRW_TEX_WRAP);
+ GPU_texture_compare_mode(tex, flags & DRW_TEX_COMPARE);
+ GPU_texture_unbind(tex);
}
-GPUTexture *DRW_texture_create_1d(int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
+GPUTexture *DRW_texture_create_1d(int w,
+ eGPUTextureFormat format,
+ DRWTextureFlag flags,
+ const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_1d(w, format, fpixels, NULL);
- drw_texture_set_parameters(tex, flags);
+ GPUTexture *tex = GPU_texture_create_1d(w, format, fpixels, NULL);
+ drw_texture_set_parameters(tex, flags);
- return tex;
+ return tex;
}
-GPUTexture *DRW_texture_create_2d(int w, int h, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
+GPUTexture *DRW_texture_create_2d(
+ int w, int h, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_2d(w, h, format, fpixels, NULL);
- drw_texture_set_parameters(tex, flags);
+ GPUTexture *tex = GPU_texture_create_2d(w, h, format, fpixels, NULL);
+ drw_texture_set_parameters(tex, flags);
- return tex;
+ return tex;
}
GPUTexture *DRW_texture_create_2d_array(
- int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
+ int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_2d_array(w, h, d, format, fpixels, NULL);
- drw_texture_set_parameters(tex, flags);
+ GPUTexture *tex = GPU_texture_create_2d_array(w, h, d, format, fpixels, NULL);
+ drw_texture_set_parameters(tex, flags);
- return tex;
+ return tex;
}
GPUTexture *DRW_texture_create_3d(
- int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
+ int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_3d(w, h, d, format, fpixels, NULL);
- drw_texture_set_parameters(tex, flags);
+ GPUTexture *tex = GPU_texture_create_3d(w, h, d, format, fpixels, NULL);
+ drw_texture_set_parameters(tex, flags);
- return tex;
+ return tex;
}
-GPUTexture *DRW_texture_create_cube(int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
+GPUTexture *DRW_texture_create_cube(int w,
+ eGPUTextureFormat format,
+ DRWTextureFlag flags,
+ const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_cube(w, format, fpixels, NULL);
- drw_texture_set_parameters(tex, flags);
+ GPUTexture *tex = GPU_texture_create_cube(w, format, fpixels, NULL);
+ drw_texture_set_parameters(tex, flags);
- return tex;
+ return tex;
}
-GPUTexture *DRW_texture_pool_query_2d(int w, int h, eGPUTextureFormat format, DrawEngineType *engine_type)
+GPUTexture *DRW_texture_pool_query_2d(int w,
+ int h,
+ eGPUTextureFormat format,
+ DrawEngineType *engine_type)
{
- BLI_assert(drw_texture_format_supports_framebuffer(format));
- GPUTexture *tex = GPU_viewport_texture_pool_query(DST.viewport, engine_type, w, h, format);
+ BLI_assert(drw_texture_format_supports_framebuffer(format));
+ GPUTexture *tex = GPU_viewport_texture_pool_query(DST.viewport, engine_type, w, h, format);
- return tex;
+ return tex;
}
-void DRW_texture_ensure_fullscreen_2d(GPUTexture **tex, eGPUTextureFormat format, DRWTextureFlag flags)
+void DRW_texture_ensure_fullscreen_2d(GPUTexture **tex,
+ eGPUTextureFormat format,
+ DRWTextureFlag flags)
{
- if (*(tex) == NULL) {
- const float *size = DRW_viewport_size_get();
- *(tex) = DRW_texture_create_2d((int)size[0], (int)size[1], format, flags, NULL);
- }
+ if (*(tex) == NULL) {
+ const float *size = DRW_viewport_size_get();
+ *(tex) = DRW_texture_create_2d((int)size[0], (int)size[1], format, flags, NULL);
+ }
}
-void DRW_texture_ensure_2d(GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags)
+void DRW_texture_ensure_2d(
+ GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags)
{
- if (*(tex) == NULL) {
- *(tex) = DRW_texture_create_2d(w, h, format, flags, NULL);
- }
+ if (*(tex) == NULL) {
+ *(tex) = DRW_texture_create_2d(w, h, format, flags, NULL);
+ }
}
void DRW_texture_generate_mipmaps(GPUTexture *tex)
{
- GPU_texture_bind(tex, 0);
- GPU_texture_generate_mipmap(tex);
- GPU_texture_unbind(tex);
+ GPU_texture_bind(tex, 0);
+ GPU_texture_generate_mipmap(tex);
+ GPU_texture_unbind(tex);
}
void DRW_texture_free(GPUTexture *tex)
{
- GPU_texture_free(tex);
+ GPU_texture_free(tex);
}