Michael Jones (Apple)
a0f269f682
This is the first of a sequence of changes to support compiling Cycles kernels as MSL (Metal Shading Language) in preparation for a Metal GPU device implementation. MSL requires that all pointer types be declared with explicit address space attributes (device, thread, etc...). There is already precedent for this with Cycles' address space macros (ccl_global, ccl_private, etc...), therefore the first step of MSL-enablement is to apply these consistently. Line-for-line this represents the largest change required to enable MSL. Applying this change first will simplify future patches as well as offering the emergent benefit of enhanced descriptiveness. The vast majority of deltas in this patch fall into one of two cases: - Ensuring ccl_private is specified for thread-local pointer types - Ensuring ccl_global is specified for device-wide pointer types Additionally, the ccl_addr_space qualifier can be removed. Prior to Cycles X, ccl_addr_space was used as a context-dependent address space qualifier, but now it is either redundant (e.g. in struct typedefs), or can be replaced by ccl_global in the case of pointer types. Associated function variants (e.g. lcg_step_float_addrspace) are also redundant. In cases where address space qualifiers are chained with "const", this patch places the address space qualifier first. The rationale for this is that the choice of address space is likely to have the greater impact on runtime performance and overall architecture. The final part of this patch is the addition of a metal/compat.h header. This is partially complete and will be extended in future patches, paving the way for the full Metal implementation. Ref T92212 Reviewed By: brecht Maniphest Tasks: T92212 Differential Revision: https://developer.blender.org/D12864
76 lines
2.1 KiB
C++
76 lines
2.1 KiB
C++
/*
|
|
* Copyright 2017 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __UTIL_RECT_H__
|
|
#define __UTIL_RECT_H__
|
|
|
|
#include "util/util_types.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* Rectangles are represented as a int4 containing the coordinates of the lower-left and
|
|
* upper-right corners in the order (x0, y0, x1, y1). */
|
|
|
|
ccl_device_inline int4 rect_from_shape(int x0, int y0, int w, int h)
|
|
{
|
|
return make_int4(x0, y0, x0 + w, y0 + h);
|
|
}
|
|
|
|
ccl_device_inline int4 rect_expand(int4 rect, int d)
|
|
{
|
|
return make_int4(rect.x - d, rect.y - d, rect.z + d, rect.w + d);
|
|
}
|
|
|
|
/* Returns the intersection of two rects. */
|
|
ccl_device_inline int4 rect_clip(int4 a, int4 b)
|
|
{
|
|
return make_int4(max(a.x, b.x), max(a.y, b.y), min(a.z, b.z), min(a.w, b.w));
|
|
}
|
|
|
|
ccl_device_inline bool rect_is_valid(int4 rect)
|
|
{
|
|
return (rect.z > rect.x) && (rect.w > rect.y);
|
|
}
|
|
|
|
/* Returns the local row-major index of the pixel inside the rect. */
|
|
ccl_device_inline int coord_to_local_index(int4 rect, int x, int y)
|
|
{
|
|
int w = rect.z - rect.x;
|
|
return (y - rect.y) * w + (x - rect.x);
|
|
}
|
|
|
|
/* Finds the coordinates of a pixel given by its row-major index in the rect,
|
|
* and returns whether the pixel is inside it. */
|
|
ccl_device_inline bool local_index_to_coord(int4 rect,
|
|
int idx,
|
|
ccl_private int *x,
|
|
ccl_private int *y)
|
|
{
|
|
int w = rect.z - rect.x;
|
|
*x = (idx % w) + rect.x;
|
|
*y = (idx / w) + rect.y;
|
|
return (*y < rect.w);
|
|
}
|
|
|
|
ccl_device_inline int rect_size(int4 rect)
|
|
{
|
|
return (rect.z - rect.x) * (rect.w - rect.y);
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* __UTIL_RECT_H__ */
|