> + > + *base = this->shader_program->UniformStorage[location].opaque[shader].index; self-review: this needs to use UniformRemapTable here, so it picks up the correct uniforms (fixes fs-texelFetch-2D). Dave.