[Bf-blender-cvs] [56777c7] soc-2016-cycles_images: Use some more cuda_pop_context(); calls to make following this easier.

[Thomas Dinges]

Commit: 56777c7a52311589c27cda29a8c25625d737c9ba
Author: Thomas Dinges
Date:   Thu May 19 02:22:21 2016 +0200
Branches: soc-2016-cycles_images
https://developer.blender.org/rB56777c7a52311589c27cda29a8c25625d737c9ba

Use some more cuda_pop_context(); calls to make following this easier.

===================================================================

M       intern/cycles/device/device_cuda.cpp

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp 
b/intern/cycles/device/device_cuda.cpp
index 79a70e0..94abc1d 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -553,11 +553,15 @@ public:
                                cuda_pop_context();
                                return;
                        }
+
+                       cuda_pop_context();
                }
 
                /* Data Storage */
                if(interpolation == INTERPOLATION_NONE) {
                        if(has_bindless_textures) {
+                               cuda_pop_context();
+
                                mem_alloc(mem, MEM_READ_ONLY);
                                mem_copy_to(mem);
 
@@ -592,6 +596,8 @@ public:
                                cuda_assert(cuTexRefSetAddress(NULL, texref, 
cuda_device_ptr(mem.device_pointer), size));
                                cuda_assert(cuTexRefSetFilterMode(texref, 
CU_TR_FILTER_MODE_POINT));
                                cuda_assert(cuTexRefSetFlags(texref, 
CU_TRSF_READ_AS_INTEGER));
+
+                               cuda_pop_context();
                        }
                }
                /* Texture Storage */
@@ -690,6 +696,8 @@ public:
                                cuda_assert(cuTexRefSetFlags(texref, 
CU_TRSF_NORMALIZED_COORDINATES));
                        }
 
+                       cuda_pop_context();
+
                        /* Fermi and Kepler */
                        mem.device_pointer = (device_ptr)handle;
                        mem.device_size = size;
@@ -699,6 +707,8 @@ public:
 
                /* Fermi, Data and Image Textures */
                if(!has_bindless_textures) {
+                       cuda_push_context();
+
                        cuda_assert(cuTexRefSetAddressMode(texref, 0, 
address_mode));
                        cuda_assert(cuTexRefSetAddressMode(texref, 1, 
address_mode));
                        if(mem.data_depth > 1) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs