My bad for operating on the wrong upstream for several days without
realizing it. Need to make sure cl.xml extension changes from github are
still present.
Merge branch 'master' of github.com:KhronosGroup/OpenCL-Registry
Conflicts:
index.php
diff --git a/sdk/1.2/docs/man/clRetainMemObject.xml b/sdk/1.2/docs/man/clRetainMemObject.xml
index e5f0022..8d61c9e 100644
--- a/sdk/1.2/docs/man/clRetainMemObject.xml
+++ b/sdk/1.2/docs/man/clRetainMemObject.xml
@@ -76,7 +76,8 @@
<para>
<citerefentry><refentrytitle>clCreateBuffer</refentrytitle></citerefentry>,
<citerefentry><refentrytitle>clCreateSubBuffer</refentrytitle></citerefentry>, and
- <citerefentry><refentrytitle>clCreateImage</refentrytitle></citerefentry>, and perform an implicit retain.
+ <citerefentry><refentrytitle>clCreateImage</refentrytitle></citerefentry>
+ perform an implicit retain.
</para>
<para>
diff --git a/sdk/1.2/docs/man/cl_image_desc.xml b/sdk/1.2/docs/man/cl_image_desc.xml
index 3d90869..b3a2ca4 100644
--- a/sdk/1.2/docs/man/cl_image_desc.xml
+++ b/sdk/1.2/docs/man/cl_image_desc.xml
@@ -41,7 +41,7 @@
<!-- ALTERNATIVE SYNTAX SYNOPSIS (NON-FUNCTION) -->
- <refsect2 id="synopsis">
+ <refsect2 xmlns:xlink="http://www.w3.org/1999/xlink" id="synopsis">
<title>
</title>
@@ -51,16 +51,16 @@
<tbody>
<row>
<entry>typedef struct _cl_image_desc {
- cl_mem_object_type image_type;
- size_t image_width;
- size_t image_height;
- size_t image_depth;
- size_t image_array_size;
- size_t image_row_pitch;
- size_t image_slice_pitch;
- cl_uint num_mip_levels;
- cl_uint num_samples;
- cl_mem buffer;
+ <link xlink:href="enums.html#cl_mem_object_type">cl_mem_object_type</link> image_type;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_width;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_height;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_depth;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_array_size;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_row_pitch;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_slice_pitch;
+ <link xlink:href="scalarDataTypes.html">cl_uint</link> num_mip_levels;
+ <link xlink:href="scalarDataTypes.html">cl_uint</link> num_samples;
+ <link xlink:href="abstractDataTypes.html">cl_mem</link> buffer;
} cl_image_desc;</entry>
</row>
</tbody>
diff --git a/sdk/1.2/docs/man/read_imagef1d.xml b/sdk/1.2/docs/man/read_imagef1d.xml
index 74ee697..d933fa0 100644
--- a/sdk/1.2/docs/man/read_imagef1d.xml
+++ b/sdk/1.2/docs/man/read_imagef1d.xml
@@ -163,7 +163,7 @@
<parameter>sampler</parameter>
</paramdef>
<paramdef>
- <link xlink:href="vectorDataTypes.html">float4</link>
+ <link xlink:href="vectorDataTypes.html">float2</link>
<parameter>coord</parameter>
</paramdef>
</funcprototype>
diff --git a/sdk/1.2/docs/man/read_imageh1d.xml b/sdk/1.2/docs/man/read_imageh1d.xml
index 5066046..06efa9d 100644
--- a/sdk/1.2/docs/man/read_imageh1d.xml
+++ b/sdk/1.2/docs/man/read_imageh1d.xml
@@ -190,7 +190,7 @@
<parameter>sampler</parameter>
</paramdef>
<paramdef>
- <link xlink:href="vectorDataTypes.html">float4</link>
+ <link xlink:href="vectorDataTypes.html">float2</link>
<parameter>coord</parameter>
</paramdef>
</funcprototype>
diff --git a/sdk/2.0/docs/man/cl_image_desc.xml b/sdk/2.0/docs/man/cl_image_desc.xml
index 4bd212e..0dcccac 100644
--- a/sdk/2.0/docs/man/cl_image_desc.xml
+++ b/sdk/2.0/docs/man/cl_image_desc.xml
@@ -41,7 +41,7 @@
<!-- ALTERNATIVE SYNTAX SYNOPSIS (NON-FUNCTION) -->
- <refsect2 id="synopsis">
+ <refsect2 xmlns:xlink="http://www.w3.org/1999/xlink" id="synopsis">
<title>
</title>
@@ -51,16 +51,16 @@
<tbody>
<row>
<entry>typedef struct _cl_image_desc {
- cl_mem_object_type image_type;
- size_t image_width;
- size_t image_height;
- size_t image_depth;
- size_t image_array_size;
- size_t image_row_pitch;
- size_t image_slice_pitch;
- cl_uint num_mip_levels;
- cl_uint num_samples;
- cl_mem mem_object;
+ <link xlink:href="enums.html#cl_mem_object_type">cl_mem_object_type</link> image_type;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_width;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_height;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_depth;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_array_size;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_row_pitch;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_slice_pitch;
+ <link xlink:href="scalarDataTypes.html">cl_uint</link> num_mip_levels;
+ <link xlink:href="scalarDataTypes.html">cl_uint</link> num_samples;
+ <link xlink:href="abstractDataTypes.html">cl_mem</link> buffer;
} cl_image_desc;</entry>
</row>
</tbody>
diff --git a/sdk/2.0/docs/man/read_imageh1d.xml b/sdk/2.0/docs/man/read_imageh1d.xml
index 55b34e8..6163324 100644
--- a/sdk/2.0/docs/man/read_imageh1d.xml
+++ b/sdk/2.0/docs/man/read_imageh1d.xml
@@ -190,7 +190,7 @@
<parameter>sampler</parameter>
</paramdef>
<paramdef>
- <link xlink:href="vectorDataTypes.html">float4</link>
+ <link xlink:href="vectorDataTypes.html">float2</link>
<parameter>coord</parameter>
</paramdef>
</funcprototype>
diff --git a/sdk/2.0/docs/man/sampler_t.xml b/sdk/2.0/docs/man/sampler_t.xml
index d96e828..b13e14f 100644
--- a/sdk/2.0/docs/man/sampler_t.xml
+++ b/sdk/2.0/docs/man/sampler_t.xml
@@ -272,7 +272,7 @@
<listitem>
<para>
If the image channel order is <constant>CL_DEPTH</constant>,
- the border value is 1.0f.
+ the border value is 0.0f.
</para>
</listitem>
diff --git a/sdk/2.0/docs/man/xhtml/sampler_t.html b/sdk/2.0/docs/man/xhtml/sampler_t.html
index b039079..becf6da 100644
--- a/sdk/2.0/docs/man/xhtml/sampler_t.html
+++ b/sdk/2.0/docs/man/xhtml/sampler_t.html
@@ -454,7 +454,7 @@
<li class="listitem" style="list-style-type: disc">
<p>
If the image channel order is <code class="constant">CL_DEPTH</code>,
- the border value is 1.0f.
+ the border value is 0.0f.
</p>
</li>
</ul>
diff --git a/sdk/2.1/docs/man/cl_image_desc.xml b/sdk/2.1/docs/man/cl_image_desc.xml
index 4bd212e..0dcccac 100644
--- a/sdk/2.1/docs/man/cl_image_desc.xml
+++ b/sdk/2.1/docs/man/cl_image_desc.xml
@@ -41,7 +41,7 @@
<!-- ALTERNATIVE SYNTAX SYNOPSIS (NON-FUNCTION) -->
- <refsect2 id="synopsis">
+ <refsect2 xmlns:xlink="http://www.w3.org/1999/xlink" id="synopsis">
<title>
</title>
@@ -51,16 +51,16 @@
<tbody>
<row>
<entry>typedef struct _cl_image_desc {
- cl_mem_object_type image_type;
- size_t image_width;
- size_t image_height;
- size_t image_depth;
- size_t image_array_size;
- size_t image_row_pitch;
- size_t image_slice_pitch;
- cl_uint num_mip_levels;
- cl_uint num_samples;
- cl_mem mem_object;
+ <link xlink:href="enums.html#cl_mem_object_type">cl_mem_object_type</link> image_type;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_width;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_height;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_depth;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_array_size;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_row_pitch;
+ <link xlink:href="scalarDataTypes.html">size_t</link> image_slice_pitch;
+ <link xlink:href="scalarDataTypes.html">cl_uint</link> num_mip_levels;
+ <link xlink:href="scalarDataTypes.html">cl_uint</link> num_samples;
+ <link xlink:href="abstractDataTypes.html">cl_mem</link> buffer;
} cl_image_desc;</entry>
</row>
</tbody>
diff --git a/sdk/2.1/docs/man/read_imageh1d.xml b/sdk/2.1/docs/man/read_imageh1d.xml
index 55b34e8..6163324 100644
--- a/sdk/2.1/docs/man/read_imageh1d.xml
+++ b/sdk/2.1/docs/man/read_imageh1d.xml
@@ -190,7 +190,7 @@
<parameter>sampler</parameter>
</paramdef>
<paramdef>
- <link xlink:href="vectorDataTypes.html">float4</link>
+ <link xlink:href="vectorDataTypes.html">float2</link>
<parameter>coord</parameter>
</paramdef>
</funcprototype>
diff --git a/sdk/2.1/docs/man/sampler_t.xml b/sdk/2.1/docs/man/sampler_t.xml
index 1bed3c1..c11cca0 100644
--- a/sdk/2.1/docs/man/sampler_t.xml
+++ b/sdk/2.1/docs/man/sampler_t.xml
@@ -279,7 +279,7 @@
<listitem>
<para>
If the image channel order is <constant>CL_DEPTH</constant>,
- the border value is 1.0f.
+ the border value is 0.0f.
</para>
</listitem>
diff --git a/sdk/2.1/docs/man/xhtml/sampler_t.html b/sdk/2.1/docs/man/xhtml/sampler_t.html
index 461fb78..eb7678f 100644
--- a/sdk/2.1/docs/man/xhtml/sampler_t.html
+++ b/sdk/2.1/docs/man/xhtml/sampler_t.html
@@ -460,7 +460,7 @@
<li class="listitem" style="list-style-type: disc">
<p>
If the image channel order is <code class="constant">CL_DEPTH</code>,
- the border value is 1.0f.
+ the border value is 0.0f.
</p>
</li>
</ul>
