OpenJDK / portola / portola
changeset 28076:64c048b63cea
8059944: [OGL] Metrics for a method choice copying of texture should be improved
Reviewed-by: bae, prr
| author | serb |
|---|---|
| date | Fri, 28 Nov 2014 14:03:56 +0300 |
| parents | 565055be0b90 |
| children | cdd7ab00a1e2 |
| files | jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c Fri Nov 28 13:55:09 2014 +0300 +++ b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c Fri Nov 28 14:03:56 2014 +0300 @@ -674,6 +674,9 @@ viaTexture = JNI_TRUE; break; #endif + case OGLC_VENDOR_INTEL: + viaTexture = JNI_TRUE; + break; default: // just use the glDrawPixels() codepath viaTexture = JNI_FALSE;
--- a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c Fri Nov 28 13:55:09 2014 +0300 +++ b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c Fri Nov 28 14:03:56 2014 +0300 @@ -919,8 +919,8 @@ 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);
--- a/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h Fri Nov 28 13:55:09 2014 +0300 +++ b/jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h Fri Nov 28 14:03:56 2014 +0300 @@ -152,7 +152,7 @@ #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