| Index: gpu/command_buffer/service/texture_manager.h
|
| diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
|
| index 2485146677adff6954f45c6546ebc696ad37ed64..f555b74ddad9d1d191623dcd264ff52ad86523da 100644
|
| --- a/gpu/command_buffer/service/texture_manager.h
|
| +++ b/gpu/command_buffer/service/texture_manager.h
|
| @@ -646,8 +646,8 @@ struct DecoderTextureState {
|
| force_cube_map_positive_x_allocation(
|
| workarounds.force_cube_map_positive_x_allocation),
|
| force_cube_complete(workarounds.force_cube_complete),
|
| - unpack_alignment_workaround_with_unpack_buffer(
|
| - workarounds.unpack_alignment_workaround_with_unpack_buffer) {}
|
| + unpack_parameters_workaround_with_unpack_buffer(
|
| + workarounds.unpack_parameters_workaround_with_unpack_buffer) {}
|
|
|
| // This indicates all the following texSubImage*D calls that are part of the
|
| // failed texImage*D call should be ignored. The client calls have a lock
|
| @@ -662,7 +662,7 @@ struct DecoderTextureState {
|
| bool texsubimage_faster_than_teximage;
|
| bool force_cube_map_positive_x_allocation;
|
| bool force_cube_complete;
|
| - bool unpack_alignment_workaround_with_unpack_buffer;
|
| + bool unpack_parameters_workaround_with_unpack_buffer;
|
| };
|
|
|
| // This class keeps track of the textures and their sizes so we can do NPOT and
|
| @@ -1063,7 +1063,7 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
|
| TextureRef* texture_ref,
|
| const DoTexImageArguments& args);
|
|
|
| - void DoTexSubImageWithAlignmentWorkaround(
|
| + void DoTexSubImageWithUnpackParamsWorkaround(
|
| DecoderTextureState* texture_state,
|
| ContextState* state,
|
| const DoTexSubImageArguments& args);
|
|
|