Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8059944: [OGL] Metrics for a method choice copying of texture should be improved
authorserb
Fri, 28 Nov 2014 14:03:56 +0300
changeset 28076 64c048b63cea
parent 28075 565055be0b90
child 28077 cdd7ab00a1e2
8059944: [OGL] Metrics for a method choice copying of texture should be improved Reviewed-by: bae, prr
jdk/src/java.desktop/share/native/common/java2d/opengl/OGLBlitLoops.c file | annotate | diff | comparison | revisions
jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.c file | annotate | diff | comparison | revisions
jdk/src/java.desktop/share/native/common/java2d/opengl/OGLContext.h file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox