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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-01-04 14:42:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-01-04 14:42:13 +0300
commit785fc137cefd7b7afda0b724be9954a2faa27763 (patch)
tree88d1b3f1c555e472c054c4566e7daec85ca65ee4 /source/blender/gpu
parent538d58745a23acfc729dd09eaacb773a6f6b364f (diff)
parente6acb4fba0945cb03cda7da7ce63a20abc7b0e7d (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_extensions.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 57962951154..10bd5810cc9 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -339,6 +339,10 @@ void gpu_extensions_init(void)
GG.device = GPU_DEVICE_SOFTWARE;
GG.driver = GPU_DRIVER_SOFTWARE;
}
+ else if (strstr(renderer, "llvmpipe")) {
+ GG.device = GPU_DEVICE_SOFTWARE;
+ GG.driver = GPU_DRIVER_SOFTWARE;
+ }
else {
printf("Warning: Could not find a matching GPU name. Things may not behave as expected.\n");
GG.device = GPU_DEVICE_ANY;