Blender Git Loki

Cycles kernel split: Make it possible to force usage of split kernel

Controlled via CYCLES_OPENCL_SPLIT_KERNEL_TEST environment variable.

Also added a bit of logging to OpenCL device creation.

Enums should not be in CAPS.

Get rid of bogus XXX comments

Cycles kernel split: Fix compilation error after recent changes

this includes compilation fix for OSL and some tweaks to code to make
strict compiler flags happy,

Make sure we undef KERNEL_TEX once we are done with it

make "const ccl_addr_space" consistent throughout the code

Move definition of ccl_addr_space to kernel_compat_*

Rename __ADDR_SPACE__ to ccl_addr_space

Merge branch 'master' into cycles_kernel_split

Conflicts:
CMakeLists.txt
intern/cycles/device/device_opencl.cpp
intern/cycles/kernel/geom/geom_motion_triangle.h
intern/cycles/kernel/kernel_light.h
intern/cycles/kernel/kernel_passes.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/kernel_volume.h
release/datafiles/fonts/droidsans.ttf.gz
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_core.h
source/blender/bmesh/intern/bmesh_operator_api_inline.h
source/blender/bmesh/intern/bmesh_queries.c
source/blender/compositor/nodes/COM_ImageNode.cpp
source/blender/compositor/operations/COM_BlurBaseOperation.cpp
source/blender/compositor/operations/COM_CompositorOperation.cpp
source/blender/editors/include/ED_screen.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_rip.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_opengl.c
source/blender/editors/render/render_preview.c
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Refactor : "if (" -> "if(", "for (" -> "for("

Fix mem leak : Release per_sample_output_buffers mem

Complete all kernel exec before releasing tile

Bug fix : Account for ShaderClosure ptr in ShaderData SOA

Move work_stealing macro to device_opencl.cpp

Move viewport render to the beginning of load_kernels

This early check lessens the delay to path_trace during
viewport render

Refactor : Remove tabs in tile-split message

Use OpenCLCache for megakernel

Change class hierarchy in device_opencl.cpp and refactor

Class hierarchy change :
The new class hierarchy is as follows,
OpenCLDeviceBase (inherits Device) - Contains error-handlers, texture functiions and other
common functions between MegaKernel and SplitKernel
OpenCLDeviceSplitKernel (inherits OpenCLDeviceBase) - Contains variables and functions specific to
split kernel implementation
OpenCLDeviceMegaKernel (inherits OpenCLDeviceBase) - Contains variables and functions specific to
megakernel
Refactor :
Change "if " to "if"

Support__KERNEL_DEBUG__ flag

Dont use OpenCLCache with split kernel