diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-03 18:54:13 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-03 18:54:13 +0000 |
| commit | 45dac0d82a5a69166e86dce77c2550f7512c541e (patch) | |
| tree | 41a10f422174ef9543db2396057f052c056eb396 /src/gallium/winsys/drm/vmware/core/vmw_surface.h | |
| parent | f8d824e09a54871df899f368ebaadc9a4e5b62ff (diff) | |
| parent | 976afaf98f4b1ce32003dd014cbb3c09063bcb68 (diff) | |
Merge branch 'gallium-embedded'
Diffstat (limited to 'src/gallium/winsys/drm/vmware/core/vmw_surface.h')
| -rw-r--r-- | src/gallium/winsys/drm/vmware/core/vmw_surface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/winsys/drm/vmware/core/vmw_surface.h b/src/gallium/winsys/drm/vmware/core/vmw_surface.h index 340cc1532e..b843c4dc7d 100644 --- a/src/gallium/winsys/drm/vmware/core/vmw_surface.h +++ b/src/gallium/winsys/drm/vmware/core/vmw_surface.h @@ -36,8 +36,8 @@ #include "pipe/p_compiler.h" -#include "pipe/p_atomic.h" -#include "pipe/p_refcnt.h" +#include "util/u_atomic.h" +#include "util/u_atomic.h" #define VMW_MAX_PRESENTS 3 @@ -45,7 +45,7 @@ struct vmw_svga_winsys_surface { - struct pipe_atomic validated; + int32_t validated; /* atomic */ struct pipe_reference refcnt; struct vmw_winsys_screen *screen; |