[Bf-blender-cvs] [9181f13af71] blender2.8: Merge branch 'master' into blender2.8

[Julian Eisel]

Commit: 9181f13af710f39e28368461f9979ce2052a55ee
Author: Julian Eisel
Date:   Mon May 8 00:19:22 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB9181f13af710f39e28368461f9979ce2052a55ee

Merge branch 'master' into blender2.8

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



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

diff --cc intern/cycles/device/device.h
index 21d29a801ae,527940e8f50..c22969d7dc6
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@@ -228,28 -228,24 +228,37 @@@ struct DeviceDrawParams 
  };
  
  class Device {
+ 	friend class device_sub_ptr;
  protected:
 -	Device(DeviceInfo& info_, Stats &stats_, bool background) : background(background), vertex_buffer(0), info(info_), stats(stats_) {}
 +	enum {
 +		FALLBACK_SHADER_STATUS_NONE = 0,
 +		FALLBACK_SHADER_STATUS_ERROR,
 +		FALLBACK_SHADER_STATUS_SUCCESS,
 +	};
 +
 +	Device(DeviceInfo& info_, Stats &stats_, bool background) : background(background),
 +	    vertex_buffer(0),
 +	    fallback_status(FALLBACK_SHADER_STATUS_NONE), fallback_shader_program(0),
 +	    info(info_), stats(stats_) {}
  
  	bool background;
  	string error_msg;
  
  	/* used for real time display */
  	unsigned int vertex_buffer;
 +	int fallback_status, fallback_shader_program;
 +	int image_texture_location, fullscreen_location;
 +
 +	bool bind_fallback_display_space_shader(const float width, const float height);
  
+ 	virtual device_ptr mem_alloc_sub_ptr(device_memory& /*mem*/, int /*offset*/, int /*size*/, MemoryType /*type*/)
+ 	{
+ 		/* Only required for devices that implement denoising. */
+ 		assert(false);
+ 		return (device_ptr) 0;
+ 	}
+ 	virtual void mem_free_sub_ptr(device_ptr /*ptr*/) {};
+ 
  public:
  	virtual ~Device();