diff options
author | Brian <brian@yutani.localnet.net> | 2007-01-09 11:00:21 -0700 |
---|---|---|
committer | Brian <brian@yutani.localnet.net> | 2007-01-09 11:00:21 -0700 |
commit | 21f99792a916a62fcfae7c208f50f192d4ce5926 (patch) | |
tree | 61ceca21090231690b8227bd2f029123c3595962 /src/mesa/main/mtypes.h | |
parent | ae80d13f6df1de6628c23635a98f4fcf1c5d34c8 (diff) |
Moved NumTexInstructions, NumTexIndirections, etc. into gl_program since
they can now apply to vertex programs.
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r-- | src/mesa/main/mtypes.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index f43113a0af..b6c72055e1 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1871,6 +1871,9 @@ struct gl_program GLuint NumParameters; GLuint NumAttributes; GLuint NumAddressRegs; + GLuint NumAluInstructions; + GLuint NumTexInstructions; + GLuint NumTexIndirections; /*@}*/ /** Native, actual h/w counts */ /*@{*/ @@ -1879,6 +1882,9 @@ struct gl_program GLuint NumNativeParameters; GLuint NumNativeAttributes; GLuint NumNativeAddressRegs; + GLuint NumNativeAluInstructions; + GLuint NumNativeTexInstructions; + GLuint NumNativeTexIndirections; /*@}*/ }; @@ -1897,12 +1903,6 @@ struct gl_vertex_program struct gl_fragment_program { struct gl_program Base; /**< base class */ - GLuint NumAluInstructions; /**< GL_ARB_fragment_program */ - GLuint NumTexInstructions; - GLuint NumTexIndirections; - GLuint NumNativeAluInstructions; /**< GL_ARB_fragment_program */ - GLuint NumNativeTexInstructions; - GLuint NumNativeTexIndirections; GLenum FogOption; GLboolean UsesKill; }; |