Browse Source

tag some more methods BLOCKING

David Rose 13 years ago
parent
commit
fcbf66df25

+ 17 - 17
panda/src/gobj/texturePool.h

@@ -41,25 +41,25 @@ class EXPCL_PANDA_GOBJ TexturePool {
 PUBLISHED:
 PUBLISHED:
   INLINE static bool has_texture(const Filename &filename);
   INLINE static bool has_texture(const Filename &filename);
   INLINE static bool verify_texture(const Filename &filename);
   INLINE static bool verify_texture(const Filename &filename);
-  INLINE static Texture *load_texture(const Filename &filename, 
-                                      int primary_file_num_channels = 0,
-                                      bool read_mipmaps = false,
-                                      const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_texture(const Filename &filename,
-                                      const Filename &alpha_filename, 
-                                      int primary_file_num_channels = 0,
-                                      int alpha_file_channel = 0,
-                                      bool read_mipmaps = false,
-                                      const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_3d_texture(const Filename &filename_pattern,
-                                         bool read_mipmaps = false,
-                                         const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_2d_texture_array(const Filename &filename_pattern,
+  BLOCKING INLINE static Texture *load_texture(const Filename &filename, 
+                                               int primary_file_num_channels = 0,
                                                bool read_mipmaps = false,
                                                bool read_mipmaps = false,
                                                const LoaderOptions &options = LoaderOptions());
                                                const LoaderOptions &options = LoaderOptions());
-  INLINE static Texture *load_cube_map(const Filename &filename_pattern,
-                                       bool read_mipmaps = false,
-                                       const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_texture(const Filename &filename,
+                                               const Filename &alpha_filename, 
+                                               int primary_file_num_channels = 0,
+                                               int alpha_file_channel = 0,
+                                               bool read_mipmaps = false,
+                                               const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_3d_texture(const Filename &filename_pattern,
+                                                  bool read_mipmaps = false,
+                                                  const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_2d_texture_array(const Filename &filename_pattern,
+                                                        bool read_mipmaps = false,
+                                                        const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static Texture *load_cube_map(const Filename &filename_pattern,
+                                                bool read_mipmaps = false,
+                                                const LoaderOptions &options = LoaderOptions());
 
 
   INLINE static Texture *get_normalization_cube_map(int size);
   INLINE static Texture *get_normalization_cube_map(int size);
   INLINE static Texture *get_alpha_scale_map();
   INLINE static Texture *get_alpha_scale_map();

+ 2 - 2
panda/src/pgraph/modelPool.h

@@ -49,8 +49,8 @@ class EXPCL_PANDA_PGRAPH ModelPool {
 PUBLISHED:
 PUBLISHED:
   INLINE static bool has_model(const Filename &filename);
   INLINE static bool has_model(const Filename &filename);
   INLINE static bool verify_model(const Filename &filename);
   INLINE static bool verify_model(const Filename &filename);
-  INLINE static ModelRoot *load_model(const Filename &filename,
-                                      const LoaderOptions &options = LoaderOptions());
+  BLOCKING INLINE static ModelRoot *load_model(const Filename &filename,
+                                               const LoaderOptions &options = LoaderOptions());
 
 
   INLINE static void add_model(const Filename &filename, ModelRoot *model);
   INLINE static void add_model(const Filename &filename, ModelRoot *model);
   INLINE static void release_model(const Filename &filename);
   INLINE static void release_model(const Filename &filename);

+ 1 - 1
panda/src/pgraph/shaderPool.h

@@ -32,7 +32,7 @@ class EXPCL_PANDA_PGRAPH ShaderPool {
 PUBLISHED:
 PUBLISHED:
   INLINE static bool has_shader(const Filename &filename);
   INLINE static bool has_shader(const Filename &filename);
   INLINE static bool verify_shader(const Filename &filename);
   INLINE static bool verify_shader(const Filename &filename);
-  INLINE static CPT(Shader) load_shader(const Filename &filename);
+  BLOCKING INLINE static CPT(Shader) load_shader(const Filename &filename);
   INLINE static void add_shader(const Filename &filename, Shader *shader);
   INLINE static void add_shader(const Filename &filename, Shader *shader);
   INLINE static void release_shader(const Filename &filename);
   INLINE static void release_shader(const Filename &filename);
   INLINE static void release_all_shaders();
   INLINE static void release_all_shaders();

+ 1 - 1
panda/src/text/fontPool.h

@@ -38,7 +38,7 @@ PUBLISHED:
 
 
   INLINE static bool has_font(const string &filename);
   INLINE static bool has_font(const string &filename);
   INLINE static bool verify_font(const string &filename);
   INLINE static bool verify_font(const string &filename);
-  INLINE static TextFont *load_font(const string &filename);
+  BLOCKING INLINE static TextFont *load_font(const string &filename);
   INLINE static void add_font(const string &filename, TextFont *font);
   INLINE static void add_font(const string &filename, TextFont *font);
   INLINE static void release_font(const string &filename);
   INLINE static void release_font(const string &filename);
   INLINE static void release_all_fonts();
   INLINE static void release_all_fonts();