changeset 5720:68424b0eb120

Fix to RT-34305: Remove old non working anti-aliasing code This is a low risk fix. Passed clean, build and sanity testing. Post Commit Reviewers: kcr and vadim
author Chien Yang <chien.yang@oracle.com>
date Fri, 15 Nov 2013 00:06:21 -0800
parents c634c5440bba
children eaa5e32c9952
files modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.cc modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.h
diffstat 3 files changed, 0 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java	Fri Nov 15 08:54:54 2013 +0100
+++ b/modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java	Fri Nov 15 00:06:21 2013 -0800
@@ -52,7 +52,6 @@
     public static final boolean cacheComplexShapes;
     public static final boolean useNewImageLoader;
     public static final List<String> tryOrder;
-    public static final int numSamples;
     public static final int prismStatFrequency;
     public static final boolean doPiscesText;
     public static final boolean doOpenPiscesText;
@@ -215,14 +214,6 @@
 
         tryOrder = Collections.unmodifiableList(Arrays.asList(tryOrderArr));
 
-        /* Multisampling in the form -Dprism.multisample=<true|2|4|8> */
-        numSamples = getInt(systemProperties, "prism.multisample",
-                            0, 2, "Try -Dprism.multisample=<true|2|4|8>");
-        if (numSamples > 0) {
-            System.out.println("Enabling multisampling with " +
-                               numSamples + " samples per pixel");
-        }
-
         String npprop = systemProperties.getProperty("prism.nativepisces");
         if (npprop == null) {
             doNativePisces = PlatformUtil.isEmbedded() || !PlatformUtil.isLinux();
--- a/modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.cc	Fri Nov 15 08:54:54 2013 +0100
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.cc	Fri Nov 15 00:06:21 2013 -0800
@@ -75,31 +75,6 @@
 
     devType = SelectDeviceType();
 
-    // Partial fix to RT-5534
-    // Cache the value set to prism.multisample (in the Java land)
-
-    int numSamples = cfg.getInt("numSamples");
-
-    switch (numSamples) {
-        case 0:
-            userMultiSampleType = D3DMULTISAMPLE_NONE;
-            break;
-        case 2:
-            userMultiSampleType = D3DMULTISAMPLE_2_SAMPLES;
-            RlsTrace(NWT_TRACE_INFO, "Multisample == D3DMULTISAMPLE_2_SAMPLES\n");
-            break;
-        case 4:
-            userMultiSampleType = D3DMULTISAMPLE_4_SAMPLES;
-            RlsTrace(NWT_TRACE_INFO, "Multisample == D3DMULTISAMPLE_4_SAMPLES\n");
-            break;
-        case 8:
-            userMultiSampleType = D3DMULTISAMPLE_8_SAMPLES;
-            RlsTrace(NWT_TRACE_INFO, "Multisample == D3DMULTISAMPLE_8_SAMPLES\n");
-            break;
-        default:
-            userMultiSampleType = D3DMULTISAMPLE_NONE;
-            RlsTrace(NWT_TRACE_INFO, "Only support multisample value of 2|4|8, forcing to D3DMULTISAMPLE_0_SAMPLES\n");
-    }
 }
 
 HRESULT D3DPipelineManager::ReleaseD3D()
--- a/modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.h	Fri Nov 15 08:54:54 2013 +0100
+++ b/modules/graphics/src/main/native-prism-d3d/D3DPipelineManager.h	Fri Nov 15 00:06:21 2013 -0800
@@ -83,8 +83,6 @@
     LPDIRECT3D9 GetD3DObject() { return pd3d9; }
     D3DDEVTYPE GetDeviceType() { return devType; }
 
-    D3DMULTISAMPLE_TYPE GetUserMultiSampleType() { return userMultiSampleType; };
-
     // returns adapterOrdinal given a HMONITOR handle
     UINT GetAdapterOrdinalByHmon(HMONITOR hMon);
 
@@ -146,7 +144,6 @@
     // instance of this object
     static D3DPipelineManager* pMgr;
 
-    D3DMULTISAMPLE_TYPE userMultiSampleType;
 };
 
 #define OS_UNDEFINED    (0 << 0)