michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix clCreateImage2D/3D checks

This commit is contained in:
Ioannis Tsakpinis 2015-10-11 22:52:50 +03:00
parent 6650201a6d
commit a5d81379f7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/org/lwjgl/opencl/CLChecks.java
View File

@ -31,9 +31,11 @@
*/
package org.lwjgl.opencl;
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLUtil;
import org.lwjgl.PointerBuffer;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import static org.lwjgl.opencl.CL10.*;
@ -137,7 +139,7 @@ final class CLChecks {
*
* @return the 2D image size in bytes
*/
static int calculateImage2DSize(final ByteBuffer format, final long w, final long h, long row_pitch) {
static int calculateImage2DSize(final Buffer host_ptr, final ByteBuffer format, final long w, final long h, long row_pitch) {
if ( !LWJGLUtil.CHECKS )
return 0;
@ -151,7 +153,7 @@ final class CLChecks {
else if ( LWJGLUtil.DEBUG && ((row_pitch < w * elementSize) || (row_pitch % elementSize != 0)) )
throw new IllegalArgumentException("Invalid image_row_pitch specified: " + row_pitch);
return (int)(row_pitch * h);
return (int)(row_pitch * h) >> BufferUtils.getElementSizeExponent(host_ptr);
}
/**
@ -166,7 +168,7 @@ final class CLChecks {
*
* @return the 3D image size in bytes
*/
static int calculateImage3DSize(final ByteBuffer format, final long w, final long h, final long d, long row_pitch, long slice_pitch) {
static int calculateImage3DSize(final Buffer host_ptr, final ByteBuffer format, final long w, final long h, final long d, long row_pitch, long slice_pitch) {
if ( !LWJGLUtil.CHECKS )
return 0;
@ -185,7 +187,7 @@ final class CLChecks {
else if ( LWJGLUtil.DEBUG && ((row_pitch < row_pitch * h) || (slice_pitch % row_pitch != 0)) )
throw new IllegalArgumentException("Invalid image_slice_pitch specified: " + row_pitch);
return (int)(slice_pitch * d);
return (int)(slice_pitch * d) >> BufferUtils.getElementSizeExponent(host_ptr);
}
/**

4
src/templates/org/lwjgl/opencl/CL10.java
View File

@ -576,7 +576,7 @@ public interface CL10 {
@size_t long image_width,
@size_t long image_height,
@size_t long image_row_pitch,
@Check(value = "CLChecks.calculateImage2DSize(image_format, image_width, image_height, image_row_pitch)", canBeNull = true)
@Check(value = "CLChecks.calculateImage2DSize(host_ptr, image_format, image_width, image_height, image_row_pitch)", canBeNull = true)
@cl_byte
@cl_short
@cl_int
@ -593,7 +593,7 @@ public interface CL10 {
@size_t long image_depth,
@size_t long image_row_pitch,
@size_t long image_slice_pitch,
@Check(value = "CLChecks.calculateImage3DSize(image_format, image_width, image_height, image_height, image_row_pitch, image_slice_pitch)", canBeNull = true)
@Check(value = "CLChecks.calculateImage3DSize(host_ptr, image_format, image_width, image_height, image_height, image_row_pitch, image_slice_pitch)", canBeNull = true)
@cl_byte
@cl_short
@cl_int