diff --git a/src/java/org/lwjgl/test/opencl/HelloOpenCL.java b/src/java/org/lwjgl/test/opencl/HelloOpenCL.java
index f7ab6629..4bddddb8 100644
--- a/src/java/org/lwjgl/test/opencl/HelloOpenCL.java
+++ b/src/java/org/lwjgl/test/opencl/HelloOpenCL.java
@@ -94,6 +94,7 @@ public class HelloOpenCL {
 					printDeviceInfo(device, "CL_DRIVER_VERSION", CL_DRIVER_VERSION);
 					printDeviceInfo(device, "CL_DEVICE_PROFILE", CL_DEVICE_PROFILE);
 					printDeviceInfo(device, "CL_DEVICE_VERSION", CL_DEVICE_VERSION);
+					printDeviceInfo(device, "CL_DEVICE_EXTENSIONS", CL_DEVICE_EXTENSIONS);
 					if ( caps.OpenCL11 )
 						printDeviceInfo(device, "CL_DEVICE_OPENCL_C_VERSION", CL_DEVICE_OPENCL_C_VERSION);
 
diff --git a/src/templates/org/lwjgl/opencl/KHR_fp16.java b/src/templates/org/lwjgl/opencl/KHR_fp16.java
index cb1e7433..1b2afe62 100644
--- a/src/templates/org/lwjgl/opencl/KHR_fp16.java
+++ b/src/templates/org/lwjgl/opencl/KHR_fp16.java
@@ -36,4 +36,7 @@ import org.lwjgl.util.generator.opencl.CLDeviceExtension;
 @CLDeviceExtension
 public interface KHR_fp16 {
 
+	/** cl_device_info */
+	int CL_DEVICE_HALF_FP_CONFIG = 0x1033;
+
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opencl/NV_compiler_options.java b/src/templates/org/lwjgl/opencl/NV_compiler_options.java
new file mode 100644
index 00000000..26c385c5
--- /dev/null
+++ b/src/templates/org/lwjgl/opencl/NV_compiler_options.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface NV_compiler_options {
+
+}
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opencl/NV_device_attribute_query.java b/src/templates/org/lwjgl/opencl/NV_device_attribute_query.java
new file mode 100644
index 00000000..6ec14fb6
--- /dev/null
+++ b/src/templates/org/lwjgl/opencl/NV_device_attribute_query.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface NV_device_attribute_query {
+
+	/** Accepted as the <param_name> parameter of clGetDeviceInfo. */
+	int CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV = 0x4000,
+		CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV = 0x4001,
+		CL_DEVICE_REGISTERS_PER_BLOCK_NV = 0x4002,
+		CL_DEVICE_WARP_SIZE_NV = 0x4003,
+		CL_DEVICE_GPU_OVERLAP_NV = 0x4004,
+		CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV = 0x4005,
+		CL_DEVICE_INTEGRATED_MEMORY_NV = 0x4006;
+
+}
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opencl/NV_pragma_unroll.java b/src/templates/org/lwjgl/opencl/NV_pragma_unroll.java
new file mode 100644
index 00000000..a1e40422
--- /dev/null
+++ b/src/templates/org/lwjgl/opencl/NV_pragma_unroll.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2010 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opencl;
+
+import org.lwjgl.util.generator.opencl.CLDeviceExtension;
+
+@CLDeviceExtension
+public interface NV_pragma_unroll {
+
+}
\ No newline at end of file