X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fi915%2Fi915_batchbuffer.h;h=dcf63543219b6b3029bf98a8ac0a73442ec0bcf1;hb=fd5edee7002fbaef96618603bfe831ec7cca128d;hp=78554034781b8d89ee1632b2ce2aa177f606ebed;hpb=6358e6371b31671acbfa7c00336673f62ee928c5;p=mesa.git diff --git a/src/gallium/drivers/i915/i915_batchbuffer.h b/src/gallium/drivers/i915/i915_batchbuffer.h index 78554034781..dcf63543219 100644 --- a/src/gallium/drivers/i915/i915_batchbuffer.h +++ b/src/gallium/drivers/i915/i915_batchbuffer.h @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2007 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,7 +18,7 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -48,7 +48,7 @@ i915_winsys_batchbuffer_check(struct i915_winsys_batchbuffer *batch, static INLINE void i915_winsys_batchbuffer_dword_unchecked(struct i915_winsys_batchbuffer *batch, - unsigned dword) + unsigned dword) { *(unsigned *)batch->ptr = dword; batch->ptr += 4; @@ -74,8 +74,8 @@ i915_winsys_batchbuffer_dword(struct i915_winsys_batchbuffer *batch, static INLINE void i915_winsys_batchbuffer_write(struct i915_winsys_batchbuffer *batch, - void *data, - size_t size) + void *data, + size_t size) { assert (i915_winsys_batchbuffer_space(batch) >= size); @@ -85,8 +85,8 @@ i915_winsys_batchbuffer_write(struct i915_winsys_batchbuffer *batch, static INLINE boolean i915_winsys_validate_buffers(struct i915_winsys_batchbuffer *batch, - struct i915_winsys_buffer **buffers, - int num_of_buffers) + struct i915_winsys_buffer **buffers, + int num_of_buffers) { return batch->iws->validate_buffers(batch, buffers, num_of_buffers); } @@ -95,7 +95,7 @@ static INLINE int i915_winsys_batchbuffer_reloc(struct i915_winsys_batchbuffer *batch, struct i915_winsys_buffer *buffer, enum i915_winsys_buffer_usage usage, - size_t offset, bool fenced) + size_t offset, boolean fenced) { return batch->iws->batchbuffer_reloc(batch, buffer, usage, offset, fenced); }