From 1196c7136223d9f4393317922e24b0f4678e4090 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Sun, 18 Nov 2012 13:29:35 -0800
Subject: j3dcore: remove all the texture resend code that was D3D specific

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 src/classes/share/javax/media/j3d/MasterControl.java   |  3 ---
 src/classes/share/javax/media/j3d/Renderer.java        | 10 ----------
 src/classes/share/javax/media/j3d/TextureRetained.java | 18 ------------------
 3 files changed, 31 deletions(-)

(limited to 'src')

diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java
index eecdf17..157b950 100644
--- a/src/classes/share/javax/media/j3d/MasterControl.java
+++ b/src/classes/share/javax/media/j3d/MasterControl.java
@@ -445,9 +445,6 @@ class MasterControl {
     // Maximum number of lights
     int maxLights;
 
-    // This is used for D3D only
-    int resendTexTimestamp = 0;
-
     // Set by the -Dj3d.sortShape3DBounds property, When this flag is
     // set to true, the bounds of the Shape3D node will be used in
     // place of the computed GeometryArray bounds for transparency
diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java
index a74cdb8..5e6ee6e 100644
--- a/src/classes/share/javax/media/j3d/Renderer.java
+++ b/src/classes/share/javax/media/j3d/Renderer.java
@@ -159,7 +159,6 @@ ArrayList<TextureRetained> textureReloadList = new ArrayList<TextureRetained>();
     ArrayList<Canvas3D> listOfCanvases = new ArrayList<Canvas3D>();
 
     boolean needToRebuildDisplayList = false;
-    boolean needToResendTextureDown = false;
 
     // True when either one of dirtyRenderMoleculeList,
     // dirtyDlistPerRinfoList, dirtyRenderAtomList size > 0
@@ -614,11 +613,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
 		} else if (renderType == J3dMessage.RENDER_IMMEDIATE) {
                     int command = ((Integer)m[nmesg].args[1]).intValue();
 		    //System.err.println("command= " + command);
-		    if (needToResendTextureDown) {
-			VirtualUniverse.mc.resendTexTimestamp++;
-			needToResendTextureDown = false;
-		    }
-
                     if (canvas.isFatalError()) {
                         continue;
                     }
@@ -959,10 +953,6 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
 			    break doneRender;
 			}
 
-			if (needToResendTextureDown) {
-			    VirtualUniverse.mc.resendTexTimestamp++;
-			    needToResendTextureDown = false;
-			}
 		        // handle free resource
 			if (canvas.useSharedCtx) {
 			    freeResourcesInFreeList(canvas);
diff --git a/src/classes/share/javax/media/j3d/TextureRetained.java b/src/classes/share/javax/media/j3d/TextureRetained.java
index 5ece0c0..e24f8a1 100644
--- a/src/classes/share/javax/media/j3d/TextureRetained.java
+++ b/src/classes/share/javax/media/j3d/TextureRetained.java
@@ -178,10 +178,6 @@ abstract class TextureRetained extends NodeComponentRetained {
     private HashMap<RenderBin,Integer> textureBinRefCount =
             new HashMap<RenderBin,Integer>();
 
-    // This is used for D3D only to check whether texture need to
-    // resend down
-    private int texTimestamp = 0;
-
     // need to synchronize access from multiple rendering threads
     Object resourceLock = new Object();
 
@@ -1796,20 +1792,6 @@ abstract class TextureRetained extends NodeComponentRetained {
 	    }
 	}
 
-
-	if (VirtualUniverse.mc.isD3D()) {
-	    if (texTimestamp != VirtualUniverse.mc.resendTexTimestamp) {
-		texTimestamp = VirtualUniverse.mc.resendTexTimestamp;
-		reloadTexture = true;
-	    }
-
-	    if (!reloadTexture) {
-		// D3D didn't store texture properties during Texture binding
-		updateTextureFields(cv);
-	    }
-	}
-
-
 //System.err.println("......... reloadTexture= " + reloadTexture +
 //		 " updateTexture= " + updateTexture +
 //		 " updateTextureLod= " + updateTextureLod);
-- 
cgit v1.2.3