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

*** empty log message ***

This commit is contained in:
Elias Naur 2004-01-20 10:11:02 +00:00
parent cc98822c4c
commit 038108fb76
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/native/common/arb/org_lwjgl_opengl_arb_ARBVertexBufferObject.cpp
View File

@ -97,7 +97,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_arb_ARBVertexBufferObject_nglBuffer
(JNIEnv * env, jclass clazz, jint target, jint size, jobject data, jint data_offset, jint usage)
{
CHECK_EXISTS(glBufferDataARB)
GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset);
GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset);
glBufferDataARB(target, size, data_ptr, usage);
CHECK_GL_ERROR
}

2
src/native/common/ati/org_lwjgl_opengl_ati_ATIVertexArrayObject.cpp
View File

@ -46,7 +46,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_ati_ATIVertexArrayObject_nglNewObje
(JNIEnv * env, jclass clazz, jint size, jobject pPointer, jint pPointer_offset, jint usage)
{
CHECK_EXISTS(glNewObjectBufferATI)
GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset);
GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer, pPointer_offset);
GLuint result = glNewObjectBufferATI(size, pPointer_ptr, usage);
CHECK_GL_ERROR
return result;

4
src/native/common/common_tools.h
View File

@ -67,11 +67,11 @@ extern void throwOpenALException(JNIEnv * env, const char * err);
extern void setDebugEnabled(bool enable);
extern void printfDebug(const char *format, ...);
static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer) {
static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer, int offset) {
if (buffer == NULL)
return NULL;
else
return env->GetDirectBufferAddress(buffer);
return (void *)((char *)env->GetDirectBufferAddress(buffer) + offset);
}
static inline jobject safeNewBuffer(JNIEnv *env, void *p, int size) {