summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/sis/sis_context.h
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2005-10-24 22:38:11 +0000
committerEric Anholt <anholt@FreeBSD.org>2005-10-24 22:38:11 +0000
commit005070a62a679dfb7a5676f5645458a3183ca434 (patch)
tree56548f3036cd623799c3aaee92af7eca10e9e655 /src/mesa/drivers/dri/sis/sis_context.h
parent7040b7ad88b5f8ced609340f48ad6de1b1abc9cc (diff)
Cut a bunch of code by not trying to precompute the blit commands and instead
just do it per blit. No noticable performance difference (or behavior difference, in my tests), and a significant difference in sanity.
Diffstat (limited to 'src/mesa/drivers/dri/sis/sis_context.h')
-rw-r--r--src/mesa/drivers/dri/sis/sis_context.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h
index fb5908407c..9aa92ff6e4 100644
--- a/src/mesa/drivers/dri/sis/sis_context.h
+++ b/src/mesa/drivers/dri/sis/sis_context.h
@@ -43,7 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tnl/t_vertex.h"
#include "sis_screen.h"
-#include "sis_common2.h"
+#include "sis_reg.h"
#include "sis_dri.h"
/* for GLboolean */
@@ -115,7 +115,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SUBPIXEL_X (-0.5F)
#define SUBPIXEL_Y (-0.5F)
+#define SIS_MAX_TEXTURE_SIZE 2048
+#define SIS_MAX_TEXTURES 2
#define SIS_MAX_TEXTURE_LEVELS 11
+#define SIS_MAX_FRAME_LENGTH 3
typedef struct {
GLubyte *Data; /* Pointer to texture in offscreen */
@@ -322,9 +325,6 @@ struct sis_context
GLint drawableID;
- /* SGRAM block write */
- GLboolean blockWrite;
-
GLint GlobalFlag;
GLuint last_tcl_state;
@@ -346,7 +346,6 @@ struct sis_context
/* Front/back/depth buffer info */
GLuint width, height; /* size of buffers */
GLint bottom; /* used for FLIP macro */
- ENGPACKET zClearPacket, cbClearPacket;
/* XXX These don't belong here. They should be per-drawable state. */
struct sis_renderbuffer front;
struct sis_renderbuffer back;