← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/mesa/jaunty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-04-03 12:42:06 UTC
  • mfrom: (1.2.16 upstream) (3.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20090403124206-0oo9dl0tcmd0qr38
Tags: 7.4-0ubuntu1
https://launchpad.net/bugs/330476
https://launchpad.net/bugs/347171
https://launchpad.net/bugs/349127
https://launchpad.net/bugs/146298
https://launchpad.net/bugs/324854
* New upstream release, merge from debian-experimental
  (LP: #330476, #347171, #349127)
* Drop 103_rs600_support.patch, included in this version.
* Drop 104_swrast_fbconfigs.patch, included in this version.
* Add 103_bump_965_texture_limit.diff. (LP: #146298)
* Add 104_fix_dri2_ext_tfp.diff. (LP: #324854)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/main/get.c
884
884
         params[0] = _mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT);
885
885
         break;
886
886
      case GL_TEXTURE_BINDING_1D:
887
 
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name);
 
887
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name);
888
888
         break;
889
889
      case GL_TEXTURE_BINDING_2D:
890
 
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D->Name);
 
890
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name);
891
891
         break;
892
892
      case GL_TEXTURE_BINDING_3D:
893
 
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name);
 
893
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name);
894
894
         break;
895
895
      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
896
896
         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
897
 
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name);
 
897
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name);
898
898
         break;
899
899
      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
900
900
         CHECK_EXT1(MESA_texture_array, "GetBooleanv");
901
 
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
 
901
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name);
902
902
         break;
903
903
      case GL_TEXTURE_GEN_S:
904
904
         params[0] = ((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0);
1071
1071
         break;
1072
1072
      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
1073
1073
         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
1074
 
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name);
 
1074
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name);
1075
1075
         break;
1076
1076
      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
1077
1077
         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
1569
1569
         break;
1570
1570
      case GL_TEXTURE_BINDING_RECTANGLE_NV:
1571
1571
         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
1572
 
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name);
 
1572
         params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name);
1573
1573
         break;
1574
1574
      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
1575
1575
         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
2732
2732
         params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
2733
2733
         break;
2734
2734
      case GL_TEXTURE_BINDING_1D:
2735
 
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name);
 
2735
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name);
2736
2736
         break;
2737
2737
      case GL_TEXTURE_BINDING_2D:
2738
 
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D->Name);
 
2738
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name);
2739
2739
         break;
2740
2740
      case GL_TEXTURE_BINDING_3D:
2741
 
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name);
 
2741
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name);
2742
2742
         break;
2743
2743
      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
2744
2744
         CHECK_EXT1(MESA_texture_array, "GetFloatv");
2745
 
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name);
 
2745
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name);
2746
2746
         break;
2747
2747
      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
2748
2748
         CHECK_EXT1(MESA_texture_array, "GetFloatv");
2749
 
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name);
 
2749
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name);
2750
2750
         break;
2751
2751
      case GL_TEXTURE_GEN_S:
2752
2752
         params[0] = BOOLEAN_TO_FLOAT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
2919
2919
         break;
2920
2920
      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
2921
2921
         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
2922
 
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name);
 
2922
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name);
2923
2923
         break;
2924
2924
      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
2925
2925
         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
3417
3417
         break;
3418
3418
      case GL_TEXTURE_BINDING_RECTANGLE_NV:
3419
3419
         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
3420
 
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name);
 
3420
         params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name);
3421
3421
         break;
3422
3422
      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
3423
3423
         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
4580
4580
         params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
4581
4581
         break;
4582
4582
      case GL_TEXTURE_BINDING_1D:
4583
 
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1D->Name;
 
4583
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name;
4584
4584
         break;
4585
4585
      case GL_TEXTURE_BINDING_2D:
4586
 
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2D->Name;
 
4586
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name;
4587
4587
         break;
4588
4588
      case GL_TEXTURE_BINDING_3D:
4589
 
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current3D->Name;
 
4589
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name;
4590
4590
         break;
4591
4591
      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
4592
4592
         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
4593
 
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current1DArray->Name;
 
4593
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name;
4594
4594
         break;
4595
4595
      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
4596
4596
         CHECK_EXT1(MESA_texture_array, "GetIntegerv");
4597
 
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Current2DArray->Name;
 
4597
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name;
4598
4598
         break;
4599
4599
      case GL_TEXTURE_GEN_S:
4600
4600
         params[0] = BOOLEAN_TO_INT(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
4767
4767
         break;
4768
4768
      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
4769
4769
         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
4770
 
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name;
 
4770
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name;
4771
4771
         break;
4772
4772
      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
4773
4773
         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
5265
5265
         break;
5266
5266
      case GL_TEXTURE_BINDING_RECTANGLE_NV:
5267
5267
         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
5268
 
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name;
 
5268
         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name;
5269
5269
         break;
5270
5270
      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
5271
5271
         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");