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:
authorRay Molenkamp <github@lazydodo.com>2018-06-27 00:17:31 +0300
committerRay Molenkamp <github@lazydodo.com>2018-06-27 00:17:31 +0300
commit6f2c9ea3e13248d146816910369983c5265bc968 (patch)
tree32b779874f8116663534ab8a6602f8f139bd6360 /source/blender/gpu/GPU_texture.h
parenta61480c27103fbf449fd14ea8061b65c29f19eae (diff)
bf_gpu: Add GPU_state module.
This has wrappers for the most common gl* functions in the codebase, and is in preparation for D3502 Reviewers: brecht, fclem Differential Revision: https://developer.blender.org/D3501
Diffstat (limited to 'source/blender/gpu/GPU_texture.h')
-rw-r--r--source/blender/gpu/GPU_texture.h19
1 files changed, 2 insertions, 17 deletions
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h
index 07880df9dc0..341abeba72f 100644
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@ -32,6 +32,8 @@
#ifndef __GPU_TEXTURE_H__
#define __GPU_TEXTURE_H__
+#include "GPU_state.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -142,19 +144,6 @@ typedef enum GPUTextureFormat {
GPU_DEPTH_COMPONENT16,
} GPUTextureFormat;
-/* These map directly to the GL_ blend functions, to minimize API add as needed*/
-typedef enum GPUBlendFunction {
- GPU_ONE,
- GPU_SRC_ALPHA,
- GPU_ONE_MINUS_SRC_ALPHA
-} GPUBlendFunction;
-
-/* These map directly to the GL_ filter functions, to minimize API add as needed*/
-typedef enum GPUFilterFunction {
- GPU_NEAREST,
- GPU_LINEAR
-} GPUFilterFunction;
-
unsigned int GPU_texture_memory_usage_get(void);
GPUTexture *GPU_texture_create_1D(
@@ -221,10 +210,6 @@ bool GPU_texture_stencil(const GPUTexture *tex);
bool GPU_texture_integer(const GPUTexture *tex);
int GPU_texture_opengl_bindcode(const GPUTexture *tex);
-void GPU_blend(bool enable);
-void GPU_blend_set_func_separate(GPUBlendFunction src_rgb, GPUBlendFunction dst_rgb, GPUBlendFunction src_alpha, GPUBlendFunction dst_alpha);
-void GPU_blend_set_func(GPUBlendFunction sfactor, GPUBlendFunction dfactor);
-
#ifdef __cplusplus
}
#endif