diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-08 14:27:35 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-08 14:33:47 -0600 |
| commit | ced699b37a048ea32434c222fcf83235048918bc (patch) | |
| tree | e1c2d5414cfac355042439b734e58a5805f2d73f /src/mesa/drivers/dri | |
| parent | abdf2e14bc174ecd510b580756efa42f43ca4419 (diff) | |
i965: use _mesa_is_bufferobj()
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_image.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index c5f5220837..28d9da0ef7 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -6,6 +6,7 @@ #include "main/macros.h" #include "main/mtypes.h" #include "main/enums.h" +#include "main/bufferobj.h" #include "main/colortab.h" #include "main/convolve.h" #include "main/context.h" @@ -206,7 +207,7 @@ try_pbo_upload(struct intel_context *intel, GLuint src_offset, src_stride; GLuint dst_offset, dst_stride; - if (unpack->BufferObj->Name == 0 || + if (!_mesa_is_bufferobj(unpack->BufferObj) || intel->ctx._ImageTransferState || unpack->SkipPixels || unpack->SkipRows) { DBG("%s: failure 1\n", __FUNCTION__); @@ -264,7 +265,7 @@ try_pbo_zcopy(struct intel_context *intel, GLuint src_offset, src_stride; GLuint dst_offset, dst_stride; - if (unpack->BufferObj->Name == 0 || + if (!_mesa_is_bufferobj(unpack->BufferObj) || intel->ctx._ImageTransferState || unpack->SkipPixels || unpack->SkipRows) { DBG("%s: failure 1\n", __FUNCTION__); @@ -427,7 +428,7 @@ intelTexImage(GLcontext * ctx, */ if (dims <= 2 && intelImage->mt && - unpack->BufferObj->Name != 0 && + _mesa_is_bufferobj(unpack->BufferObj) && check_pbo_format(internalFormat, format, type, intelImage->base.TexFormat)) { |