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>2015-07-28 14:51:10 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-28 15:14:24 +0300
commit3fba620858fa5bf44bec3124c61f6cc2e40356b0 (patch)
tree41aaddb8ad9fdd6b964a62b85129a703d626d5f8 /intern/cycles/device/device_network.cpp
parent29ebb56f4d8b99ca3038c7a3d0ed794ef77ee7f9 (diff)
Cycles: Prepare for more image extension types support
Basically just replace boolean periodic flag with extension type enum in the device API.
Diffstat (limited to 'intern/cycles/device/device_network.cpp')
-rw-r--r--intern/cycles/device/device_network.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/intern/cycles/device/device_network.cpp b/intern/cycles/device/device_network.cpp
index 1d6066c94dc..d1f941ad9f2 100644
--- a/intern/cycles/device/device_network.cpp
+++ b/intern/cycles/device/device_network.cpp
@@ -163,7 +163,10 @@ public:
snd.write_buffer(host, size);
}
- void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, bool periodic)
+ void tex_alloc(const char *name,
+ device_memory& mem,
+ InterpolationType interpolation,
+ ExtensionType extension)
{
VLOG(1) << "Texture allocate: " << name << ", " << mem.memory_size() << " bytes.";
@@ -178,7 +181,7 @@ public:
snd.add(name_string);
snd.add(mem);
snd.add(interpolation);
- snd.add(periodic);
+ snd.add(extension);
snd.write();
snd.write_buffer((void*)mem.data_pointer, mem.memory_size());
}
@@ -571,13 +574,13 @@ protected:
network_device_memory mem;
string name;
InterpolationType interpolation;
- bool periodic;
+ ExtensionType extension_typr;
device_ptr client_pointer;
rcv.read(name);
rcv.read(mem);
rcv.read(interpolation);
- rcv.read(periodic);
+ rcv.read(extension);
lock.unlock();
client_pointer = mem.device_pointer;
@@ -593,7 +596,7 @@ protected:
rcv.read_buffer((uint8_t*)mem.data_pointer, data_size);
- device->tex_alloc(name.c_str(), mem, interpolation, periodic);
+ device->tex_alloc(name.c_str(), mem, interpolation, extension);
pointer_mapping_insert(client_pointer, mem.device_pointer);
}