← Back to branch summary

~mmach/netext73/mesa-ryzen

« back to all changes in this revision

Viewing changes to src/mesa/main/teximage.c

  • Committer: mmach
  • Date: 2023-11-02 21:31:35 UTC
  • Revision ID: netbit73@gmail.com-20231102213135-18d4tzh7tj0uz752
2023-11-02 22:11:57

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/main/teximage.c
2424
2424
         return GL_TRUE;
2425
2425
      }
2426
2426
 
2427
 
      if (ctx->ReadBuffer->Visual.samples > 0) {
 
2427
      if (!ctx->st_opts->allow_multisampled_copyteximage &&
 
2428
          ctx->ReadBuffer->Visual.samples > 0) {
2428
2429
         _mesa_error(ctx, GL_INVALID_OPERATION,
2429
2430
                     "glCopyTexImage%dD(multisample FBO)", dimensions);
2430
2431
         return GL_TRUE;
2691
2692
         return GL_TRUE;
2692
2693
      }
2693
2694
 
2694
 
      if (ctx->ReadBuffer->Visual.samples > 0) {
2695
 
         _mesa_error(ctx, GL_INVALID_OPERATION,
2696
 
                "%s(multisample FBO)", caller);
 
2695
      if (!ctx->st_opts->allow_multisampled_copyteximage &&
 
2696
          ctx->ReadBuffer->Visual.samples > 0) {
 
2697
         _mesa_error(ctx, GL_INVALID_OPERATION, "%s(multisample FBO)",
 
2698
                     caller);
2697
2699
         return GL_TRUE;
2698
2700
      }
2699
2701
   }
3884
3886
 
3885
3887
   /* Must handle special case GL_TEXTURE_CUBE_MAP. */
3886
3888
   if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
3887
 
      GLint imageStride;
 
3889
      intptr_t imageStride;
3888
3890
 
3889
3891
      /*
3890
3892
       * What do we do if the user created a texture with the following code