Mesa (radeon-rewrite): radeon: remove old cube code

Dave Airlie airlied at kemper.freedesktop.org
Sat Feb 14 02:09:41 UTC 2009


Module: Mesa
Branch: radeon-rewrite
Commit: fcc7a691dc968d9d2bc61a8bf18dfbd7ed789598
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcc7a691dc968d9d2bc61a8bf18dfbd7ed789598

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Feb 13 20:34:19 2009 +1000

radeon: remove old cube code

---

 src/mesa/drivers/dri/radeon/radeon_texstate.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
index 2e064cf..1aa5f98 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
@@ -730,21 +730,10 @@ static void import_tex_obj_state( r100ContextPtr rmesa,
 
       if (texobj->base.Target == GL_TEXTURE_CUBE_MAP) {
 	 uint32_t *cube_cmd = &rmesa->hw.cube[unit].cmd[CUBE_CMD_0];
-	 //	 GLuint bytesPerFace = texobj->base.totalSize / 6;
-	 //	 ASSERT(texobj->base.totalSize % 6 == 0);
-	 GLuint bytesPerFace = 1; // TODO
 
 	 RADEON_STATECHANGE( rmesa, cube[unit] );
 	 cube_cmd[CUBE_PP_CUBIC_FACES] = texobj->pp_cubic_faces;
-	 /* dont know if this setup conforms to OpenGL.. 
-	  * at least it matches the behavior of mesa software renderer
-	  */
-	 cube_cmd[CUBE_PP_CUBIC_OFFSET_0] = texobj->pp_txoffset; /* right */
-	 cube_cmd[CUBE_PP_CUBIC_OFFSET_1] = texobj->pp_txoffset + 1 * bytesPerFace; /* left */
-	 cube_cmd[CUBE_PP_CUBIC_OFFSET_2] = texobj->pp_txoffset + 2 * bytesPerFace; /* top */
-	 cube_cmd[CUBE_PP_CUBIC_OFFSET_3] = texobj->pp_txoffset + 3 * bytesPerFace; /* bottom */
-	 cube_cmd[CUBE_PP_CUBIC_OFFSET_4] = texobj->pp_txoffset + 4 * bytesPerFace; /* front */
-	 cmd[TEX_PP_TXOFFSET] = texobj->pp_txoffset + 5 * bytesPerFace; /* back */
+	 /* state filled out in the cube_emit */
       }
    }
 




More information about the mesa-commit mailing list