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 <brecht@blender.org>2020-05-22 20:02:49 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-22 22:50:24 +0300
commitf27e122d95a4c682365c592585a9d78392192809 (patch)
treed3fb37da6ed4eb207b4fe7d2a8e0ba0721e82fc9
parent98689f51c01141da83fb3e592dd4f4cdc75750d4 (diff)
Fix T76925: Cycles OpenCL compile error with some drivers on Linux
-rw-r--r--intern/cycles/kernel/kernel_film.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h
index 3829426f261..8344f4b4f47 100644
--- a/intern/cycles/kernel/kernel_film.h
+++ b/intern/cycles/kernel/kernel_film.h
@@ -28,13 +28,13 @@ ccl_device float4 film_get_pass_result(KernelGlobals *kg,
int display_pass_components = kernel_data.film.display_pass_components;
if (display_pass_components == 4) {
- ccl_global float4 *in = (ccl_global float4 *)(buffer + display_pass_stride +
- index * kernel_data.film.pass_stride);
+ float4 in = *(ccl_global float4 *)(buffer + display_pass_stride +
+ index * kernel_data.film.pass_stride);
float alpha = use_display_sample_scale ?
- (kernel_data.film.use_display_pass_alpha ? in->w : 1.0f / sample_scale) :
+ (kernel_data.film.use_display_pass_alpha ? in.w : 1.0f / sample_scale) :
1.0f;
- pass_result = make_float4(in->x, in->y, in->z, alpha);
+ pass_result = make_float4(in.x, in.y, in.z, alpha);
int display_divide_pass_stride = kernel_data.film.display_divide_pass_stride;
if (display_divide_pass_stride != -1) {