← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/gpu/intern/gpu_codegen.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/gpu/intern/gpu_codegen.h
43
43
struct GPUNode;
44
44
struct GPUVertexAttribs;
45
45
struct GPUFrameBuffer;
 
46
struct PreviewImage;
46
47
 
47
48
#define MAX_FUNCTION_NAME       64
48
49
#define MAX_PARAMETER           32
91
92
        const char *attribname;
92
93
 
93
94
        int image;
 
95
        int image_isdata;
94
96
 
95
97
        int texture;
96
98
        int texturesize;
98
100
        void *ptr1, *ptr2;
99
101
 
100
102
        int dynamic;
101
 
        int dynamictype;        
 
103
        int dynamictype;
102
104
 
103
105
        int type;
104
106
        int users;
137
139
 
138
140
        struct Image *ima;              /* image */
139
141
        struct ImageUser *iuser;/* image user */
 
142
        struct PreviewImage *prv;       /* preview images & icons */
 
143
        int image_isdata;               /* image does not contain color data */
140
144
        float *dynamicvec;              /* vector data in case it is dynamic */
141
145
        int dynamictype;                /* origin of the dynamic uniform (GPUDynamicType) */
142
146
        void *dynamicdata;              /* data source of the dynamic uniform */