Improve workaround for wgpu's gles texture type inference

Improve workaround for wgpu's gles texture type inference #521