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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-20 13:47:06 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-20 14:32:36 +0300
commit7cbb8f20a4b479380dac1d2a2f7c7f85ede408be (patch)
tree3c5b5a91f2cdc2eb285cfa41886053366337ff11 /source/blender/makesrna/intern
parented0c9654ddfdcbe19d8094d4b4a43f0f06d9ee5c (diff)
GPU: automatically draw images with GLSL shader depending on resolution
This adds a new "Automatic" image display method which uses GLSL shaders for most images. It only does CPU side color management for higher res images where sending big float buffers to the GPU is likely to be a bottleneck or cause memory usage problem. Automatic is the default now, previously it was 2D Texture.
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index d81ae82fbc5..488143da316 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4580,6 +4580,11 @@ static void rna_def_userdef_system(BlenderRNA *brna)
};
static const EnumPropertyItem image_draw_methods[] = {
+ {IMAGE_DRAW_METHOD_AUTO,
+ "AUTO",
+ 0,
+ "Automatic",
+ "Automatically choose method based on GPU and image"},
{IMAGE_DRAW_METHOD_2DTEXTURE,
"2DTEXTURE",
0,
@@ -4590,12 +4595,6 @@ static void rna_def_userdef_system(BlenderRNA *brna)
0,
"GLSL",
"Use GLSL shaders for display transform and draw image with 2D texture"},
- {IMAGE_DRAW_METHOD_DRAWPIXELS,
- "DRAWPIXELS",
- 0,
- "DrawPixels",
- "Use CPU for display transform and draw image using DrawPixels"},
- {0, NULL, 0, NULL, NULL},
};
srna = RNA_def_struct(brna, "PreferencesSystem", NULL);