diff options
| author | serb <none@none> | 2014-11-28 14:03:56 +0300 |
|---|---|---|
| committer | serb <none@none> | 2014-11-28 14:03:56 +0300 |
| commit | 332fbe274de7e2919155ec55f3a81609df541bbb (patch) | |
| tree | 9966a3ca29a7af4c2e098156b47f26b3eb3b106e /src/share/native/sun | |
| parent | 5456295726a3ae2ac6270e7ce41fdd5fdf08f328 (diff) | |
8059944: [OGL] Metrics for a method choice copying of texture should be improved
Reviewed-by: bae, prr
Diffstat (limited to 'src/share/native/sun')
| -rw-r--r-- | src/share/native/sun/java2d/opengl/OGLBlitLoops.c | 3 | ||||
| -rw-r--r-- | src/share/native/sun/java2d/opengl/OGLContext.c | 4 | ||||
| -rw-r--r-- | src/share/native/sun/java2d/opengl/OGLContext.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/share/native/sun/java2d/opengl/OGLBlitLoops.c b/src/share/native/sun/java2d/opengl/OGLBlitLoops.c index fa9a2fe34..c96791f76 100644 --- a/src/share/native/sun/java2d/opengl/OGLBlitLoops.c +++ b/src/share/native/sun/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/src/share/native/sun/java2d/opengl/OGLContext.c b/src/share/native/sun/java2d/opengl/OGLContext.c index 013949126..af1eb9c1a 100644 --- a/src/share/native/sun/java2d/opengl/OGLContext.c +++ b/src/share/native/sun/java2d/opengl/OGLContext.c @@ -917,8 +917,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/src/share/native/sun/java2d/opengl/OGLContext.h b/src/share/native/sun/java2d/opengl/OGLContext.h index 0f44232f3..27c5cec59 100644 --- a/src/share/native/sun/java2d/opengl/OGLContext.h +++ b/src/share/native/sun/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 |