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:
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu/kernel.cpp')
-rw-r--r--intern/cycles/kernel/kernels/cpu/kernel.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp
index 7679ab4f111..0ea5b1999aa 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel.cpp
+++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp
@@ -75,11 +75,7 @@ void kernel_const_copy(KernelGlobals *kg, const char *name, void *host, size_t s
void kernel_tex_copy(KernelGlobals *kg,
const char *name,
device_ptr mem,
- size_t width,
- size_t height,
- size_t depth,
- InterpolationType interpolation,
- ExtensionType extension)
+ size_t size)
{
if(0) {
}
@@ -87,7 +83,7 @@ void kernel_tex_copy(KernelGlobals *kg,
#define KERNEL_TEX(type, tname) \
else if(strcmp(name, #tname) == 0) { \
kg->tname.data = (type*)mem; \
- kg->tname.width = width; \
+ kg->tname.width = size; \
}
#define KERNEL_IMAGE_TEX(type, tname)
#include "kernel/kernel_textures.h"