diff options
| author | Samuel Pitoiset <[email protected]> | 2017-06-01 11:35:25 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-07 11:04:25 +0200 |
| commit | 185a79a549dfed309c2a124c95fe18597f56dfa7 (patch) | |
| tree | 3d4d05432819ba65512b3f646971efe3cafd75c7 | |
| parent | 6fedb31785970168e2070c42e6da2f9a47f683f2 (diff) | |
mesa: rename prepare_target() to prepare_target_err()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mesa/main/copyimage.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c index cf25159e880..07c2359dda5 100644 --- a/src/mesa/main/copyimage.c +++ b/src/mesa/main/copyimage.c @@ -57,16 +57,16 @@ enum mesa_block_class { * \return true if success, false if error */ static bool -prepare_target(struct gl_context *ctx, GLuint name, GLenum target, - int level, int z, int depth, - struct gl_texture_image **tex_image, - struct gl_renderbuffer **renderbuffer, - mesa_format *format, - GLenum *internalFormat, - GLuint *width, - GLuint *height, - GLuint *num_samples, - const char *dbg_prefix) +prepare_target_err(struct gl_context *ctx, GLuint name, GLenum target, + int level, int z, int depth, + struct gl_texture_image **tex_image, + struct gl_renderbuffer **renderbuffer, + mesa_format *format, + GLenum *internalFormat, + GLuint *width, + GLuint *height, + GLuint *num_samples, + const char *dbg_prefix) { if (name == 0) { _mesa_error(ctx, GL_INVALID_VALUE, @@ -484,14 +484,16 @@ _mesa_CopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, return; } - if (!prepare_target(ctx, srcName, srcTarget, srcLevel, srcZ, srcDepth, - &srcTexImage, &srcRenderbuffer, &srcFormat, - &srcIntFormat, &src_w, &src_h, &src_num_samples, "src")) + if (!prepare_target_err(ctx, srcName, srcTarget, srcLevel, srcZ, srcDepth, + &srcTexImage, &srcRenderbuffer, &srcFormat, + &srcIntFormat, &src_w, &src_h, &src_num_samples, + "src")) return; - if (!prepare_target(ctx, dstName, dstTarget, dstLevel, dstZ, srcDepth, - &dstTexImage, &dstRenderbuffer, &dstFormat, - &dstIntFormat, &dst_w, &dst_h, &dst_num_samples, "dst")) + if (!prepare_target_err(ctx, dstName, dstTarget, dstLevel, dstZ, srcDepth, + &dstTexImage, &dstRenderbuffer, &dstFormat, + &dstIntFormat, &dst_w, &dst_h, &dst_num_samples, + "dst")) return; _mesa_get_format_block_size(srcFormat, &src_bw, &src_bh); |