← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/virtualbox-ose/oneiric

« back to all changes in this revision

Viewing changes to src/VBox/GuestHost/OpenGL/include/state/cr_bufferobject.h

  • 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/include/state/cr_bufferobject.h
9
9
 
10
10
#include "cr_hash.h"
11
11
#include "state/cr_statetypes.h"
 
12
#include "state/cr_statefuncs.h"
12
13
 
13
14
#ifdef __cplusplus
14
15
extern "C" {
29
30
 */
30
31
typedef struct {
31
32
        GLuint refCount;
32
 
        GLuint name;
 
33
        GLuint id;
 
34
    GLuint hwid;
33
35
        GLenum usage;
34
36
        GLenum access;
35
37
        GLuint size;      /* buffer size in bytes */
49
51
    CRBufferObject *unpackBuffer;
50
52
 
51
53
        CRBufferObject *nullBuffer;  /* name = 0 */
52
 
 
53
 
        CRHashTable *buffers;
54
 
 
55
 
    GLboolean   bResyncNeeded;
56
54
} CRBufferObjectState;
57
55
 
58
56
DECLEXPORT(CRBufferObject *) crStateGetBoundBufferObject(GLenum target, CRBufferObjectState *b);
59
57
DECLEXPORT(GLboolean) crStateIsBufferBound(GLenum target);
60
58
 
 
59
DECLEXPORT(GLuint) STATE_APIENTRY crStateBufferHWIDtoID(GLuint hwid);
 
60
DECLEXPORT(GLuint) STATE_APIENTRY crStateGetBufferHWID(GLuint id);
 
61
 
61
62
#ifdef __cplusplus
62
63
}
63
64
#endif