From 4ca54eb6964e04daee5d99d7cb80b87326fc3461 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 28 Nov 2014 14:03:56 +0300 Subject: [PATCH] 8059944: [OGL] Metrics for a method choice copying of texture should be improved Reviewed-by: bae, prr --- .../share/native/common/java2d/opengl/OGLBlitLoops.c | 3 +++ .../share/native/common/java2d/opengl/OGLContext.c | 4 ++-- .../share/native/common/java2d/opengl/OGLContext.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c index fa9a2fe34a5..c96791f76cc 100644 --- a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c +++ b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c @@ -674,6 +674,9 @@ OGLBlitLoops_Blit(JNIEnv *env, viaTexture = JNI_TRUE; break; #endif + case OGLC_VENDOR_INTEL: + viaTexture = JNI_TRUE; + break; default: // just use the glDrawPixels() codepath viaTexture = JNI_FALSE; diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c index ed179f64369..a33e201a39a 100644 --- a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c +++ b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c @@ -919,8 +919,8 @@ OGLContext_GetExtensionInfo(JNIEnv *env, jint *caps) vcap = OGLC_VENDOR_ATI; } else if (strncmp(vendor, "NVIDIA", 6) == 0) { vcap = OGLC_VENDOR_NVIDIA; - } else if (strncmp(vendor, "Sun", 3) == 0) { - vcap = OGLC_VENDOR_SUN; + } else if (strncmp(vendor, "Intel", 5) == 0) { + vcap = OGLC_VENDOR_INTEL; } // REMIND: new in 7 - check if needs fixing *caps |= ((vcap & OGLC_VCAP_MASK) << OGLC_VCAP_OFFSET); diff --git a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h index 0f44232f316..27c5cec5909 100644 --- a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h +++ b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h @@ -152,7 +152,7 @@ typedef struct { #define OGLC_VENDOR_OTHER 0 #define OGLC_VENDOR_ATI 1 #define OGLC_VENDOR_NVIDIA 2 -#define OGLC_VENDOR_SUN 3 +#define OGLC_VENDOR_INTEL 3 #define OGLC_VCAP_MASK 0x3 #define OGLC_VCAP_OFFSET 24