From 444cc945e12f1bda4d3bfd208ec2a4de0173d90c Mon Sep 17 00:00:00 2001 From: FalcoTheBold Date: Mon, 11 Mar 2019 08:33:06 +0100 Subject: [PATCH] Revert "Small fixes #3" This reverts commit 18e58fec4ae06adcd9addad7f8f52e4122743399. --- modules/javafx.graphics/src/main/native-prism-es2/GLContext.c | 2 +- .../javafx.graphics/src/main/native-prism-es2/PrismES2Defs.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/javafx.graphics/src/main/native-prism-es2/GLContext.c b/modules/javafx.graphics/src/main/native-prism-es2/GLContext.c index 4ccab8c2ed..4a60b6d238 100644 --- a/modules/javafx.graphics/src/main/native-prism-es2/GLContext.c +++ b/modules/javafx.graphics/src/main/native-prism-es2/GLContext.c @@ -2275,7 +2275,7 @@ JNIEXPORT void JNICALL Java_com_sun_prism_es2_GLContext_nSetAmbientLight */ JNIEXPORT void JNICALL Java_com_sun_prism_es2_GLContext_nSetPointLight (JNIEnv *env, jclass class, jlong nativeCtxInfo, jlong nativeMeshViewInfo, - jint index, jfloat x, jfloat y, jfloat z, jfloat r, jfloat g, jfloat b, jfloat w, jfloat range, jfloat ca, jfloat la, jfloat qa) + jint index, jfloat x, jfloat y, jfloat z, jfloat r, jfloat g, jfloat b, jfloat w, jfloat range, jfloat ca, ifloat la, jfloat qa) { ContextInfo *ctxInfo = (ContextInfo *) jlong_to_ptr(nativeCtxInfo); MeshViewInfo *meshViewInfo = (MeshViewInfo *) jlong_to_ptr(nativeMeshViewInfo); diff --git a/modules/javafx.graphics/src/main/native-prism-es2/PrismES2Defs.h b/modules/javafx.graphics/src/main/native-prism-es2/PrismES2Defs.h index 3d0402730f..aede70b041 100644 --- a/modules/javafx.graphics/src/main/native-prism-es2/PrismES2Defs.h +++ b/modules/javafx.graphics/src/main/native-prism-es2/PrismES2Defs.h @@ -380,10 +380,6 @@ struct MeshViewInfoRec { GLfloat pointLightWeight; GLfloat pointLightPosition[3]; GLfloat pointLightColor[3]; - - GLfloat pointLightRange; - GLfloat pointLightAttenuation[3]; - GLboolean cullEnable; GLenum cullMode; GLenum fillMode;