Cleanup: renaming and consistency for kernel data

* Rename "texture" to "data array". This has not used textures for a long time,
  there are just global memory arrays now. (On old CUDA GPUs there was a cache
  for textures but not global memory, so we used to put all data in textures.)
* For CUDA and HIP, put globals in KernelParams struct like other devices.
* Drop __ prefix for data array names, no possibility for naming conflict now that
  these are in a struct.

1 files changed, 44 insertions, 44 deletions

diff --git a/intern/cycles/scene/scene.cpp b/intern/cycles/scene/scene.cpp
index 33ce0a45733..1fcc3331337 100644
--- a/intern/cycles/scene/scene.cpp
+++ b/intern/cycles/scene/scene.cpp
@@ -34,49 +34,49 @@
 CCL_NAMESPACE_BEGIN
 
 DeviceScene::DeviceScene(Device *device)
-    : bvh_nodes(device, "__bvh_nodes", MEM_GLOBAL),
-      bvh_leaf_nodes(device, "__bvh_leaf_nodes", MEM_GLOBAL),
-      object_node(device, "__object_node", MEM_GLOBAL),
-      prim_type(device, "__prim_type", MEM_GLOBAL),
-      prim_visibility(device, "__prim_visibility", MEM_GLOBAL),
-      prim_index(device, "__prim_index", MEM_GLOBAL),
-      prim_object(device, "__prim_object", MEM_GLOBAL),
-      prim_time(device, "__prim_time", MEM_GLOBAL),
-      tri_verts(device, "__tri_verts", MEM_GLOBAL),
-      tri_shader(device, "__tri_shader", MEM_GLOBAL),
-      tri_vnormal(device, "__tri_vnormal", MEM_GLOBAL),
-      tri_vindex(device, "__tri_vindex", MEM_GLOBAL),
-      tri_patch(device, "__tri_patch", MEM_GLOBAL),
-      tri_patch_uv(device, "__tri_patch_uv", MEM_GLOBAL),
-      curves(device, "__curves", MEM_GLOBAL),
-      curve_keys(device, "__curve_keys", MEM_GLOBAL),
-      curve_segments(device, "__curve_segments", MEM_GLOBAL),
-      patches(device, "__patches", MEM_GLOBAL),
-      points(device, "__points", MEM_GLOBAL),
-      points_shader(device, "__points_shader", MEM_GLOBAL),
-      objects(device, "__objects", MEM_GLOBAL),
-      object_motion_pass(device, "__object_motion_pass", MEM_GLOBAL),
-      object_motion(device, "__object_motion", MEM_GLOBAL),
-      object_flag(device, "__object_flag", MEM_GLOBAL),
-      object_volume_step(device, "__object_volume_step", MEM_GLOBAL),
-      object_prim_offset(device, "__object_prim_offset", MEM_GLOBAL),
-      camera_motion(device, "__camera_motion", MEM_GLOBAL),
-      attributes_map(device, "__attributes_map", MEM_GLOBAL),
-      attributes_float(device, "__attributes_float", MEM_GLOBAL),
-      attributes_float2(device, "__attributes_float2", MEM_GLOBAL),
-      attributes_float3(device, "__attributes_float3", MEM_GLOBAL),
-      attributes_float4(device, "__attributes_float4", MEM_GLOBAL),
-      attributes_uchar4(device, "__attributes_uchar4", MEM_GLOBAL),
-      light_distribution(device, "__light_distribution", MEM_GLOBAL),
-      lights(device, "__lights", MEM_GLOBAL),
-      light_background_marginal_cdf(device, "__light_background_marginal_cdf", MEM_GLOBAL),
-      light_background_conditional_cdf(device, "__light_background_conditional_cdf", MEM_GLOBAL),
-      particles(device, "__particles", MEM_GLOBAL),
-      svm_nodes(device, "__svm_nodes", MEM_GLOBAL),
-      shaders(device, "__shaders", MEM_GLOBAL),
-      lookup_table(device, "__lookup_table", MEM_GLOBAL),
-      sample_pattern_lut(device, "__sample_pattern_lut", MEM_GLOBAL),
-      ies_lights(device, "__ies", MEM_GLOBAL)
+    : bvh_nodes(device, "bvh_nodes", MEM_GLOBAL),
+      bvh_leaf_nodes(device, "bvh_leaf_nodes", MEM_GLOBAL),
+      object_node(device, "object_node", MEM_GLOBAL),
+      prim_type(device, "prim_type", MEM_GLOBAL),
+      prim_visibility(device, "prim_visibility", MEM_GLOBAL),
+      prim_index(device, "prim_index", MEM_GLOBAL),
+      prim_object(device, "prim_object", MEM_GLOBAL),
+      prim_time(device, "prim_time", MEM_GLOBAL),
+      tri_verts(device, "tri_verts", MEM_GLOBAL),
+      tri_shader(device, "tri_shader", MEM_GLOBAL),
+      tri_vnormal(device, "tri_vnormal", MEM_GLOBAL),
+      tri_vindex(device, "tri_vindex", MEM_GLOBAL),
+      tri_patch(device, "tri_patch", MEM_GLOBAL),
+      tri_patch_uv(device, "tri_patch_uv", MEM_GLOBAL),
+      curves(device, "curves", MEM_GLOBAL),
+      curve_keys(device, "curve_keys", MEM_GLOBAL),
+      curve_segments(device, "curve_segments", MEM_GLOBAL),
+      patches(device, "patches", MEM_GLOBAL),
+      points(device, "points", MEM_GLOBAL),
+      points_shader(device, "points_shader", MEM_GLOBAL),
+      objects(device, "objects", MEM_GLOBAL),
+      object_motion_pass(device, "object_motion_pass", MEM_GLOBAL),
+      object_motion(device, "object_motion", MEM_GLOBAL),
+      object_flag(device, "object_flag", MEM_GLOBAL),
+      object_volume_step(device, "object_volume_step", MEM_GLOBAL),
+      object_prim_offset(device, "object_prim_offset", MEM_GLOBAL),
+      camera_motion(device, "camera_motion", MEM_GLOBAL),
+      attributes_map(device, "attributes_map", MEM_GLOBAL),
+      attributes_float(device, "attributes_float", MEM_GLOBAL),
+      attributes_float2(device, "attributes_float2", MEM_GLOBAL),
+      attributes_float3(device, "attributes_float3", MEM_GLOBAL),
+      attributes_float4(device, "attributes_float4", MEM_GLOBAL),
+      attributes_uchar4(device, "attributes_uchar4", MEM_GLOBAL),
+      light_distribution(device, "light_distribution", MEM_GLOBAL),
+      lights(device, "lights", MEM_GLOBAL),
+      light_background_marginal_cdf(device, "light_background_marginal_cdf", MEM_GLOBAL),
+      light_background_conditional_cdf(device, "light_background_conditional_cdf", MEM_GLOBAL),
+      particles(device, "particles", MEM_GLOBAL),
+      svm_nodes(device, "svm_nodes", MEM_GLOBAL),
+      shaders(device, "shaders", MEM_GLOBAL),
+      lookup_table(device, "lookup_table", MEM_GLOBAL),
+      sample_pattern_lut(device, "sample_pattern_lut", MEM_GLOBAL),
+      ies_lights(device, "ies", MEM_GLOBAL)
 {
   memset((void *)&data, 0, sizeof(data));
 }
@@ -366,7 +366,7 @@ void Scene::device_update(Device *device_, Progress &progress)
     dscene.data.volume_stack_size = get_volume_stack_size();
 
     progress.set_status("Updating Device", "Writing constant memory");
-    device->const_copy_to("__data", &dscene.data, sizeof(dscene.data));
+    device->const_copy_to("data", &dscene.data, sizeof(dscene.data));
   }
 
   if (print_stats) {