← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mesa/quantal

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/r300/r300_shader.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-02-21 12:44:07 UTC
  • mfrom: (1.2.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20070221124407-rgcacs32mycrtadl
Import upstream version 6.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/r300/r300_shader.c
12
12
{
13
13
        
14
14
        r300ContextPtr rmesa = R300_CONTEXT(ctx);
15
 
        struct r300_vertex_program *vp=(void *)prog;
 
15
        struct r300_vertex_program_cont *vp=(void *)prog;
16
16
        
17
17
        
18
18
        switch(target){
19
19
                case GL_VERTEX_PROGRAM_ARB:
20
 
                rmesa->curr_vp = (struct gl_vertex_program *)vp;
21
 
                vp->ref_count++;
 
20
                //rmesa->curr_vp = (struct gl_vertex_program *)vp;
 
21
                //vp->ref_count++;
22
22
#if 0
23
23
                if((vp->ref_count % 1500) == 0) {
24
24
                        fprintf(stderr, "id %p, ref_count %d\n", vp, vp->ref_count);
37
37
static struct gl_program *
38
38
r300NewProgram(GLcontext *ctx, GLenum target, GLuint id)
39
39
{
40
 
        struct r300_vertex_program *vp;
 
40
        struct r300_vertex_program_cont *vp;
41
41
        struct r300_fragment_program *fp;
42
42
        
43
43
        switch(target){
44
44
                case GL_VERTEX_STATE_PROGRAM_NV:
45
45
                case GL_VERTEX_PROGRAM_ARB:
46
 
                        vp=CALLOC_STRUCT(r300_vertex_program);
 
46
                        vp=CALLOC_STRUCT(r300_vertex_program_cont);
47
47
                        return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id);
48
48
                case GL_FRAGMENT_PROGRAM_ARB:
49
49
                        fp=CALLOC_STRUCT(r300_fragment_program);
77
77
static void
78
78
r300ProgramStringNotify(GLcontext *ctx, GLenum target, struct gl_program *prog)
79
79
{
80
 
        struct r300_vertex_program *vp=(void *)prog;
 
80
        struct r300_vertex_program_cont *vp=(void *)prog;
81
81
        struct r300_fragment_program *fp = (struct r300_fragment_program *) prog;
82
82
        
83
83
        switch(target) {
84
84
        case GL_VERTEX_PROGRAM_ARB:
85
 
                vp->translated = GL_FALSE;
86
 
                memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct gl_vertex_program));
 
85
                vp->progs = NULL;
 
86
                /*vp->translated = GL_FALSE;
 
87
                memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct gl_vertex_program));*/
87
88
                /*r300_translate_vertex_shader(vp);*/
88
89
        break;
89
90
        case GL_FRAGMENT_PROGRAM_ARB: