diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-06-18 11:16:31 +1000 |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-06-18 11:37:57 +1000 |
| commit | de9651faa7231cc72f4c85b308c82980a2b8769f (patch) | |
| tree | ec5fc5681c6ae119a98031354c8679f8ed60d14e | |
| parent | 8dc268f32546dc047af8a1b61c4cba56dc6e22ec (diff) | |
Add new image channel orders from OpenCL 1.1.
| -rw-r--r-- | src/opencl/qclimageformat.cpp | 9 | ||||
| -rw-r--r-- | src/opencl/qclimageformat.h | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/opencl/qclimageformat.cpp b/src/opencl/qclimageformat.cpp index d6ae563..a74a180 100644 --- a/src/opencl/qclimageformat.cpp +++ b/src/opencl/qclimageformat.cpp @@ -101,6 +101,15 @@ QT_BEGIN_NAMESPACE \value Order_ARGB Alpha, red, green, then blue channels. \value Order_Intensity Single intensity channel. \value Order_Luminence Single luminence channel. + \value Order_Rx Red channel plus an ignored channel. + This value is an optional channel order in OpenCL 1.1, + and is not supported by OpenCL 1.0. + \value Order_RGx Red and green channels plus an ignored channel. + This value is an optional channel order in OpenCL 1.1, + and is not supported by OpenCL 1.0. + \value Order_RGBx Red, green, and blue channels, plus an + ignored channel. This value is an optional channel + order in OpenCL 1.1, and is not supported by OpenCL 1.0. */ /*! diff --git a/src/opencl/qclimageformat.h b/src/opencl/qclimageformat.h index 29de2df..ec22fa8 100644 --- a/src/opencl/qclimageformat.h +++ b/src/opencl/qclimageformat.h @@ -67,7 +67,10 @@ public: Order_BGRA = 0x10B6, Order_ARGB = 0x10B7, Order_Intensity = 0x10B8, - Order_Luminence = 0x10B9 + Order_Luminence = 0x10B9, + Order_Rx = 0x10BA, // OpenCL 1.1 + Order_RGx = 0x10BB, // OpenCL 1.1 + Order_RGBx = 0x10BC // OpenCL 1.1 }; enum ChannelType |