← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/GuestHost/OpenGL/packer/pack_pixels.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/GuestHost/OpenGL/packer/pack_pixels.c
63
63
                                    const CRPixelPackState *packstate,
64
64
                                    int *writeback)
65
65
{
66
 
    GET_PACKER_CONTEXT(pc);
 
66
    CR_GET_PACKER_CONTEXT(pc);
67
67
    unsigned char *data_ptr;
68
68
    GLint stride = 0;
69
69
    GLint bytes_per_row;
88
88
                stride = bytes_per_row + (packstate->alignment - remainder);
89
89
    }
90
90
 
91
 
    GET_BUFFERED_POINTER(pc, 48 + sizeof(CRNetworkPointer) );
 
91
    CR_GET_BUFFERED_POINTER(pc, 48 + sizeof(CRNetworkPointer) );
92
92
    WRITE_DATA( 0,  GLint,  x );
93
93
    WRITE_DATA( 4,  GLint,  y );
94
94
    WRITE_DATA( 8,  GLsizei,  width );
103
103
    WRITE_DATA( 44, GLint, packstate->rowLength );
104
104
    WRITE_NETWORK_POINTER( 48, (char *) pixels );
105
105
    WRITE_OPCODE( pc, CR_READPIXELS_OPCODE );
 
106
    CR_UNLOCK_PACKER_CONTEXT(pc);
106
107
}
107
108
 
108
109
/* Round N up to the next multiple of 8 */
204
205
                                     GLvoid * pixels, const CRPixelPackState * packstate,
205
206
                                     int * writeback )
206
207
{
207
 
    GET_PACKER_CONTEXT(pc);
 
208
    CR_GET_PACKER_CONTEXT(pc);
208
209
    unsigned char *data_ptr;
209
210
    (void) pc;
210
 
    GET_BUFFERED_POINTER( pc, 40 );
 
211
    CR_GET_BUFFERED_POINTER( pc, 40 );
211
212
    WRITE_DATA( 0, GLint, 40 );
212
213
    WRITE_DATA( 4, GLenum, CR_GETTEXIMAGE_EXTEND_OPCODE );
213
214
    WRITE_DATA( 8, GLenum, target );
217
218
    WRITE_NETWORK_POINTER( 24, (void *) pixels );
218
219
    WRITE_NETWORK_POINTER( 32, (void *) writeback );
219
220
    WRITE_OPCODE( pc, CR_EXTEND_OPCODE );
 
221
    CR_UNLOCK_PACKER_CONTEXT(pc);
220
222
}